Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev am: ec5a0f4656 am: e46c142ad5 am: e0a91a0000 am: be89013ef6 am: b8c6bb3bb4
am: 83b5e747b5

Change-Id: Ifc612a3cdba684ba9421d4958f85e8dc07cb5b63