Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev am: a1f536e00e
am: ff1a55a207

Change-Id: Ibcd4efc7c50a91c6dd401436a2d82171793e0e6b