Merge changes from topic "am-483519735e0742ca8eac4d37fb5b6225"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6 -s ours am: 0e38635a4d -s ours am: e910d1943b -s ours am: 96fc8ede52 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e -s ours am: d267bd8655 -s ours am: 772476e65c -s ours am: 6c427100ee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf -s ours am: 0928d5bbaf -s ours am: 3bebde58b6 -s ours am: ea0084439d -s ours