Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev
am: 3c047ea7fa

Change-Id: Ie97567da2988d921748f9b4ca86f658a5222f43b