Merge changes from topic "am-bfd7f4a421a148a482adb2b6603bbd2d"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3ad3d8fc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 676f6580 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d5bc7bec -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf8dc545 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: c526f681 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 333e2b14 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8cb9eb45 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53a5c5a6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: c5aee36a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 851ea449 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98b3a9d4 -s ours