Merge changes from topic "am-99626481-1222-4690-a6c3-4a3db61755f9" into oc-dev am: eedc6cb657 am: d9f8d9181a
am: baee23668b

Change-Id: Ifabfff51c0317c9c9230be9911a6f08404c16c85