Merge "fix issue:GSO-54" into sun
authorjin xin <j00101220@huawei.com>
Thu, 27 Oct 2016 06:26:27 +0000 (06:26 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 27 Oct 2016 06:26:27 +0000 (06:26 +0000)

Trivial merge