Merge "Issue ID: GSO-91" into sun
authorjin xin <j00101220@huawei.com>
Tue, 1 Nov 2016 09:17:27 +0000 (09:17 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Tue, 1 Nov 2016 09:17:27 +0000 (09:17 +0000)

Trivial merge