Merge "GSO-76" into sun
authorjin xin <j00101220@huawei.com>
Mon, 31 Oct 2016 07:26:39 +0000 (07:26 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 31 Oct 2016 07:26:39 +0000 (07:26 +0000)

Trivial merge