Merge changes from topic "am-be586169-b92a-4cc8-93c6-941e64bf5233" into oc-dev
am: 8fd86e81d1

Change-Id: I93cedd0c72b91d4459b4bc447290531cdb49eb52