Merge changes from topic "am-ca83f9997d2a42c9b8ac75caa9ef9412" into udc-dev

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b1e9c1f0750d47e9be992038522e27c5" into sc-qpr1-dev am: 92145ceb -s ours am: 9a1d8b1b -s ours am: 60200ddc -s ours am: dff2c77b -s ours
  [automerger skipped] [automerge] Truncate ShortcutInfo Id 2p: ab0c8ac5 am: 4bc48527 -s ours am: c44c0329 -s ours am: f797cc1d -s ours am: 3f435f48 -s ours