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

Change-Id: Ie24920330ea3045c663c8717838883d67c26f0b1