Merge changes from topic "am-e6889624-85e8-40a4-af07-d6190d5beac3" into oc-mr1-dev
am: 95b2c1bc6d

Change-Id: Ibfe56a130737fcd524771d421700ffafa4d2d73d