Merge "Resolve the Bug GSO-9"
authorjin xin <j00101220@huawei.com>
Mon, 10 Oct 2016 10:00:54 +0000 (10:00 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Mon, 10 Oct 2016 10:00:54 +0000 (10:00 +0000)

Trivial merge