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

Change-Id: Ic486624efa49655407e6a5b990aa8f4244d909b1