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

Change-Id: Ib76a04e7bab429bbdcfee69bb0240feaf154d1d2