Merge "liangxuning"
authorYan Yang <yangyanyj@chinamobile.com>
Fri, 16 Mar 2018 07:51:11 +0000 (07:51 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 16 Mar 2018 07:51:11 +0000 (07:51 +0000)

Trivial merge