Merge "fix issue: GSO-60" into sun
authorjin xin <j00101220@huawei.com>
Thu, 3 Nov 2016 16:34:33 +0000 (16:34 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 3 Nov 2016 16:34:33 +0000 (16:34 +0000)

Trivial merge