Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into oc-dev am: ec5a0f4656 am: e46c142ad5
am: e0a91a0000

Change-Id: I9b665fc06301fdcb2c2e38d6f34461e334aa1749