Merge changes from topic "am-622d8d9067ae4645ad4e220d38e220a2"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 59bc423e -s ours am: 4a0b0577 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aff5691 -s ours am: 623fbc4a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c5518d5f -s ours am: e34ef23e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f172dbcd -s ours am: 27dd61a8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7dd1b32c -s ours am: 80c8505e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f378e8c0 -s ours am: 9c2914ee -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bd158a83 -s ours am: 8b03ca42 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6900566d -s ours am: bb6a3306 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a7a68c1 -s ours am: c38028c8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f75f02da -s ours am: 98523e7a -s ours