Merge "replaced the annotations"
authorxu ran <xuranyjy@chinamobile.com>
Thu, 7 May 2020 06:32:08 +0000 (06:32 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 7 May 2020 06:32:08 +0000 (06:32 +0000)

Trivial merge