Merge "Bug fix and extended unit tests"
authorliang gao <jean.gaoliang@huawei.com>
Tue, 19 Jul 2016 08:16:28 +0000 (08:16 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 19 Jul 2016 08:16:28 +0000 (08:16 +0000)

Trivial merge