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

Trivial merge