Merge changes from topic "am-bfd7f4a421a148a482adb2b6603bbd2d"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3ad3d8fcc8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 676f65805c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d5bc7bec2a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf8dc54519 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: c526f681e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 333e2b144f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8cb9eb4590 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53a5c5a63f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: c5aee36a28 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 851ea449f4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98b3a9d415 -s ours