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

Change-Id: I4d285431b8384196b449c43360a118eddf98f15d