Merge "Issue ID :GSO-21"
authorjin xin <j00101220@huawei.com>
Sat, 15 Oct 2016 09:37:30 +0000 (09:37 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Sat, 15 Oct 2016 09:37:30 +0000 (09:37 +0000)

Trivial merge