Merge changes from topic "am-109f7458af5d41ceb727cd78287dfa75" into udc-dev

* changes:
  [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8cbb -s ours am: 2fd58ff889 -s ours am: 538aed39e1 -s ours
  [automerger skipped] Truncate ShortcutInfo Id am: fee62a33da -s ours am: 0a632feffc -s ours am: 865239dab8 -s ours