Merge "Issue ID: GSO-38" into sun
authorjin xin <j00101220@huawei.com>
Fri, 21 Oct 2016 15:25:43 +0000 (15:25 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Fri, 21 Oct 2016 15:25:43 +0000 (15:25 +0000)

Trivial merge