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

Change-Id: Ib91a39ae254922ae56b2911c29b86679d4dd16fb