Merge changes from topic "am-2bdda567-72b2-4e25-9a99-dfd3ec839928" into oc-mr1-dev
am: 38b7eabb2e

Change-Id: I83a64d559db6602635bdaa4b95c00ae7c6df555c