Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 am: f9a749eb82
am: b5334fff17

Change-Id: I2e7f90604338e5d7d8139244167c540a617d8507