Merge changes from topic "am-483519735e0742ca8eac4d37fb5b6225"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 845bbb02 -s ours am: 910bdef4 -s ours am: 87627019 -s ours am: 34659490 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9cd8845e -s ours am: 27e01d2e -s ours am: 3e2799fc -s ours am: f1fd8291 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3f219832 -s ours am: ff21a18c -s ours am: e7439166 -s ours am: 9bd0ef36 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f1ffe64 -s ours am: 75ad4d77 -s ours am: 82fc0340 -s ours am: 7e8efc2a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a16d7197 -s ours am: 1d69021f -s ours am: fb0f665d -s ours am: a43b6130 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 598f6f57 -s ours am: a349563a -s ours am: 78677932 -s ours am: 4e0d7c47 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09a86713 -s ours am: 4a7fb3c7 -s ours am: 174656a0 -s ours am: 6fdc0515 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19bfe279 -s ours am: 936ed73d -s ours am: 3355995f -s ours am: 971a1b60 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c3e8ecb7 -s ours am: 81f788da -s ours am: e59afc94 -s ours am: 5bb469a1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7710db36 -s ours am: 7947c98b -s ours am: 5d908269 -s ours am: 0bdeacce -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34c17cd5 -s ours am: c9468795 -s ours am: 1fd99c2b -s ours am: daf8430d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ded6f61b -s ours am: 3c55f50f -s ours am: a4feecbd -s ours am: 5b66262f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fa6f6d03 -s ours am: d2ba0017 -s ours am: ba19aadf -s ours am: 43a98519 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 689232da -s ours am: 5b4e9a55 -s ours am: 5b4b2d97 -s ours am: c1ef4ad3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbfb6b37 -s ours am: 489903f1 -s ours am: a97d2cd1 -s ours am: 094b3e75 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe56395a -s ours am: 8f9d031e -s ours am: 9b01e839 -s ours am: 7a706336 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 86ba379e -s ours am: 5b89ac78 -s ours am: 6710226e -s ours am: e0354690 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750a7444 -s ours am: 7845e97a -s ours am: b6df7467 -s ours am: 23777836 -s ours