Merge changes from topic "am-bf7353d4-d06a-4e6a-a3cc-42d0d5c2d7d1" into oc-dev am: 0ceac4b69f
am: 40577ef5a4

Change-Id: I3730f432d33f571fa0af695d40ee95d36b26fdab