Merge changes from topic "am-abaa00e695d949d7b49cdbde4edce9e1"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2a0153c7 -s ours am: 17a6a2e4 -s ours am: ec162d2b -s ours am: 0d560050 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e99e2b2a -s ours am: 96ac8420 -s ours am: 2a2705a4 -s ours am: 5c217e23 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f5b6c8fe -s ours am: 7ac4bfc0 -s ours am: 92efbed2 -s ours am: a9ceecfa -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e34480cf -s ours am: 1ad35afa -s ours am: 57b87539 -s ours am: aae74016 -s ours