Merge changes from topic "am-5d31a0f0b10545c48a2fd1d0d79b8a87"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 812232eb -s ours am: 3510d7ca -s ours am: 9ea6e54c -s ours am: 1319fa2a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7b0de28 -s ours am: 4cc86eb8 -s ours am: 3f67946d -s ours am: 291e83c4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d89aad45 -s ours am: 9467afac -s ours am: 7d205892 -s ours am: e0160594 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a088d7a -s ours am: c20f3d9f -s ours am: adb8eae4 -s ours am: 4529c997 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 00f05ceb -s ours am: 0ae73410 -s ours am: bf4e56de -s ours am: eddf8b48 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7786ccd -s ours am: a9b6cf8e -s ours am: 570826df -s ours am: eddf8ebf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 233b5af7 -s ours am: 10ea8c81 -s ours am: ad830a0d -s ours am: a4563548 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f28d48b -s ours am: 389c8ab1 -s ours am: ec56ff6e -s ours am: 0b221642 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3e935425 -s ours am: 4d3f7af7 -s ours am: 32480915 -s ours am: 665e4bab -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2731b0c6 -s ours am: 73b1a5ed -s ours am: 814992ee -s ours am: 7eb981c7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6fe6c178 -s ours am: d8c9f08e -s ours am: 7220d9b7 -s ours am: ce952707 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1f6b432 -s ours am: 5ab4a4c5 -s ours am: 9fc5dcbb -s ours am: 533ad1fb -s ours