Merge "Issue-Id: GSO-80 display name instead of description" into sun
authorjin xin <j00101220@huawei.com>
Tue, 1 Nov 2016 13:16:58 +0000 (13:16 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Tue, 1 Nov 2016 13:16:58 +0000 (13:16 +0000)

Trivial merge