Merge "Fix Issue-Id: GSO-80" into sun
authorjin xin <j00101220@huawei.com>
Tue, 1 Nov 2016 03:27:16 +0000 (03:27 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Tue, 1 Nov 2016 03:27:16 +0000 (03:27 +0000)

Trivial merge