Merge "GSO-94" into sun
authorTao Shen <shentao@chinamobile.com>
Wed, 2 Nov 2016 09:11:42 +0000 (09:11 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 2 Nov 2016 09:11:42 +0000 (09:11 +0000)

Trivial merge