Merge changes from topic "am-6ebe6f88-baa6-4992-847e-cbad0be1c6a5" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Always use safe labels am: 25e686d3cf am: 335c71169f am: 5641c2aaaa am: f83c1ed84c skipped: 3b917cdb72
  [automerger] RESTRICT AUTOMERGE: Always use safe labels am: 25e686d3cf am: 335c71169f am: 5641c2aaaa am: f83c1ed84c
  [automerger] RESTRICT AUTOMERGE: Always use safe labels am: 25e686d3cf am: 335c71169f am: 5641c2aaaa
  [automerger] RESTRICT AUTOMERGE: Always use safe labels am: 25e686d3cf am: 335c71169f
  [automerger] RESTRICT AUTOMERGE: Always use safe labels am: 25e686d3cf
  RESTRICT AUTOMERGE: Always use safe labels