Merge changes from topic "am-dbd4cac2645f48f1bb8ea6a9e9fef9bc"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: e837cb57 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 645e4f20 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5e96fedc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca6ff825 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1706c3e1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e32425eb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 84ef4099 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 045b5e58 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 031d34cd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1f8650f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 466cceb6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7b12f62 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: a89872c3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47b97747 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 948de0d9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 311dbfdd -s ours