Merge changes from topic "am-3ca7326a-cbf1-4f97-a1b5-a4fdfac0fb47" into oc-dev am: 652a6665 am: 5d35ad74 am: 03cddd85 Change-Id: Ifa1fe4acb2249480c1b9067e1e53a3f020008859