Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev am: 3fa917c8bc am: 51ec5967af am: ab66d6295a am: b6f1a84250
am: 463d8f89ea

Change-Id: Idfaaf51f517e888de161811a5d13f474ff989779