Merge "Issue-Id: GSO-88 Fix substitution error" into sun
authorjin xin <j00101220@huawei.com>
Thu, 3 Nov 2016 07:54:23 +0000 (07:54 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 3 Nov 2016 07:54:23 +0000 (07:54 +0000)

Trivial merge