Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev am: d0025407df
am: 0834c94a93

Change-Id: I82eb8a2dfab9d3ce1d7b8de91950d9c2069da2db