Merge "fix issue : GSO-124"
authorjin xin <j00101220@huawei.com>
Tue, 20 Dec 2016 01:25:02 +0000 (01:25 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Tue, 20 Dec 2016 01:25:02 +0000 (01:25 +0000)

Trivial merge