Merge "fix issue:GSO-95" into sun
authorjin xin <j00101220@huawei.com>
Wed, 2 Nov 2016 09:41:27 +0000 (09:41 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 2 Nov 2016 09:41:27 +0000 (09:41 +0000)

Trivial merge