Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev
am: bcf3392856

Change-Id: Ic06a49e43f4f5e1ebc4aef0f66f0ecc1296eb843