Merge "For the Jira bug GSO-6"
authorjin xin <j00101220@huawei.com>
Sat, 8 Oct 2016 07:15:11 +0000 (07:15 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Sat, 8 Oct 2016 07:15:11 +0000 (07:15 +0000)

Trivial merge