Merge changes from topic "am-7c8512fa-f7d5-4028-aad5-4471c46d5fea" into oc-dev am: d65486507f am: 040078df47
am: eced0db651

Change-Id: I9c64defd202c27a4b2126c2e39fde1ae91087e16