Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into oc-dev am: 652a666500 am: 5d35ad7446 am: 03cddd8562
am: 00f5cf45c7

Change-Id: I5272a3c39f8e7d0b60368dcc35b398f455c5ae2c