Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into oc-dev
am: 827eb741d7

Change-Id: Ic35c752cb5435d00eb91df8e296a433e859c3afc