Merge "Fix Issue-Id: GSO-84" into sun
authorjin xin <j00101220@huawei.com>
Mon, 31 Oct 2016 03:57:12 +0000 (03:57 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 31 Oct 2016 03:57:12 +0000 (03:57 +0000)

Trivial merge