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

Change-Id: I14ed475a3de2342592dfe744bab3cb518dbe4c00