Merge changes from topic "am-5e016a82-82c7-4e13-a46c-ba442963d59a" into oc-dev am: c985373782 am: 9ee9810dae
am: b82d8298ab

Change-Id: I8122e60d235a6c36bb761648fbae4466fb01ce2e