Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing