Merge changes from topic "am-6f0d1125-8060-4e8b-afe5-8e18597ac90b" into oc-dev am: ee97cf22ba am: ceb2e462f8
am: 462e72e57d

Change-Id: I50253fa1812ff0b944219513c2c99598e0b75d8e