Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa am: aaddf187e4
am: 1803fec75f

Change-Id: I3f4f5501d41ea3b39ff616c0789f2be7b3ced54b