Merge changes from topic "am-9b4b0f8c-4823-4712-936a-f4aafe519eff" into oc-dev am: 13ac18d299 am: 585ba6b3ec
am: cfa5b7fa32

Change-Id: I12fa15bd34e438b3a26dbb0bcfafb2e6b0148deb