Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev
am: a1f536e00e

Change-Id: Ic19ff34e840d35ea8e93305b8b323c9bdb81b058