Merge changes from topic "am-927da82286874827963e412229140715"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 806edcdf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 56a35db0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f2a78861 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5c74003 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f838931e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c838ad9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: a5a4f8a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42cf5ae2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 14823cfb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5d310bc2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: aab628e1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b1813c8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 6fe8ffdf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d691218e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 778684fe -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e362486a -s ours