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

* changes:
  [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182 -s ours am: 2cbc9dcf -s ours am: 3338659f -s ours am: a67b0621 -s ours am: 8f331aab -s ours am: 091e1c39 -s ours am: b9a82b6c -s ours
  [automerger skipped] Truncate ShortcutInfo Id am: 6a278c39 -s ours am: 947889f9 -s ours am: a06222a3 -s ours am: 4a654f90 -s ours am: bb8846f2 -s ours am: 98f823be -s ours am: 8a166617 -s ours