Merge changes from topic "am-82ccc496-ed65-4f6e-81f7-60006a43a473" into oc-dev am: ca8dc45d62
am: babcbdd8a0

Change-Id: I1bfd7cd3d2b51ca1374f47f74edbbec727159e47