[automerger] Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev am: 3c047ea7fa am: 3cca4e7b06 am: d4a1791bd7 am: 42fb737d13 am: abac6b84c1

Change-Id: I4af26a8ef76833a741ef62f21bcb42adbed6d5b2