Merge changes from topic "am-927da82286874827963e412229140715"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 806edcdf14 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56a35db034 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f2a78861bc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5c7400361 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f838931e45 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c838ad9c4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: a5a4f8a25c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42cf5ae230 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 14823cfb2d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5d310bc26c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: aab628e1a3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b1813c871 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 6fe8ffdf48 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d691218e3a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 778684fe55 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e362486af2 -s ours