Merge changes from topic "am-483519735e0742ca8eac4d37fb5b6225"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724 -s ours am: 0e38635a -s ours am: e910d194 -s ours am: 96fc8ede -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d -s ours am: d267bd86 -s ours am: 772476e6 -s ours am: 6c427100 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182e -s ours am: 0928d5bb -s ours am: 3bebde58 -s ours am: ea008443 -s ours