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

Trivial merge