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

Trivial merge