Merge "GSO-35"
authorTao Shen <shentao@chinamobile.com>
Fri, 21 Oct 2016 08:45:36 +0000 (08:45 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Fri, 21 Oct 2016 08:45:36 +0000 (08:45 +0000)

Trivial merge