Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev am: 38860f2cab am: 4b8765ff4a
am: 3b0285794a

Change-Id: I401b79bd0df7cf4e3b423edd70806f2ed7b3d7ea