Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-qpr1-dev

* changes:
  [automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a3152
  [Do Not Merge] Ignore malformed shortcuts