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

Change-Id: I7fff1c158dd490e88410cfaed3e1f69ce825c6fb