Merge changes from topic "am-9e052ef996a9479b8e3cbd838d129919"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7278cd68 -s ours am: 376a45a2 -s ours am: b5b169b0 -s ours am: fc4b18fc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bed84b27 -s ours am: 0c8de015 -s ours am: 8462ba07 -s ours am: 5b5ad3ad -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: feed4129 -s ours am: be05a490 -s ours am: eab91573 -s ours am: 7228386d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d602d424 -s ours am: 901f6ea8 -s ours am: d7a062c5 -s ours am: 4bea44d1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c407ffa3 -s ours am: 085557c2 -s ours am: 884037b5 -s ours am: 4cb6dea3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 868a4d14 -s ours am: afae2e28 -s ours am: ac894713 -s ours am: d02f5790 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 079f53a1 -s ours am: 9286fed7 -s ours am: 484488e4 -s ours am: c13b103e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d02dd730 -s ours am: 9a5634b1 -s ours am: 10fe12b6 -s ours am: 2e5d71d4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 32753e48 -s ours am: 72a392df -s ours am: 13067bbe -s ours am: eb154537 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 805ac6e1 -s ours am: 3ba842c5 -s ours am: a00f7735 -s ours am: 4f0c7f2c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 51c9e4e0 -s ours am: 6d6ca440 -s ours am: a884dea7 -s ours am: dec6fcd0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55d44d7f -s ours am: c42e3996 -s ours am: d40e1d5a -s ours am: f177c127 -s ours