Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev
am: 471a4e6076

Change-Id: Ie51140203150cd9ef361e713700dfef128651f4e