Merge "Fix Issue-Id: GSO-81"
authorjin xin <j00101220@huawei.com>
Mon, 31 Oct 2016 06:51:52 +0000 (06:51 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 31 Oct 2016 06:51:52 +0000 (06:51 +0000)

Trivial merge