Merge "Issue ID:GSO-43"
authorjin xin <j00101220@huawei.com>
Mon, 24 Oct 2016 06:25:07 +0000 (06:25 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 24 Oct 2016 06:25:07 +0000 (06:25 +0000)

Trivial merge