Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9" into oc-dev am: a9e5b5dce0 am: 7e01400018
am: 71e0f8ffef

Change-Id: I684ff4f5fdb0891f718c5c54b8dc61b78b73b02a