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

Change-Id: I674bd5be030c34e37443c8746c40bcae2704e1b2