Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev
am: 3262a5ad5f

Change-Id: I148aeead42b1f969cb8ff5153d7d296e84b0f4a7