Merge changes from topic "am-538bf8fd-0fa8-4c10-aeea-2cd19adfb09f" into oc-dev
am: 65e0be10ae

Change-Id: I95efd478928422675a59e29ae05dad5e9b3ff06d