Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev
am: 8c53c6e4e3

Change-Id: I64b06a863a95707eb9d5ef1db4cd5f5b2c70000b