Merge changes from topic "am-17d8054ee2eb47428323bea17b281c36" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e am: de5113ee -s ours am: 2fcbfbf6 -s ours am: 725961fb -s ours am: d0836243 -s ours am: 9f6e9f9f -s ours am: 4e12bdc3 -s ours am: 02e7e4a3 -s ours am: ac4bb89a -s ours
  [automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514 am: f67179a1 -s ours am: 0750f903 -s ours am: b74c7cbb -s ours am: aa594c9d -s ours am: ebb3803e -s ours am: ce5fbbc8 -s ours am: ca725c29 -s ours am: 07cf280e -s ours