Merge changes from topic "am-b5555f8b-af5a-4d9e-a794-b88e899638d3" into oc-dev am: 4515a8b9de
am: 3f6074573e

Change-Id: I06d1a4e2161c2513bd0e19703afdc84094c0d862