Merge changes from topic "am-27943b02-3710-49e4-84f6-eabc78fdbe01" into oc-dev
am: 4a1214cbbd

Change-Id: I360013fdd9e679c39ecf9899e547e448ce55b27f