jira: [ams mapping] Change-Id: I17b88b169c30e7c567e5e505bd7f7c56357466eb (cherry picked from commit 9166c1d0c482c38044b90df06b089f5b0ac8f042)
jira: [ams mapping] Change-Id: I17b88b169c30e7c567e5e505bd7f7c56357466eb (cherry picked from commit 9166c1d0c482c38044b90df06b089f5b0ac8f042)