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

Change-Id: Ief795f6cc13f5877acf0550a144c7f16aaa9a934