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

Change-Id: Ifa1fe4acb2249480c1b9067e1e53a3f020008859