Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev am: d349bd741d am: cf751f2189 am: dc3d2a5db0
am: 1199aac873

Change-Id: Idfdc0b9c50f99e7e35a0a6b06ce377dcf80446b7