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

Change-Id: I0e8dff954426479e5a58f0a8f0dad10a294f7b25