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

Change-Id: Ia1ad35d6bdec92f25de79793071bbe04a4a34005