Merge changes from topic "am-17ccc76e32c44921b1f1ed3509a54536"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 845bbb02 -s ours am: 94ef3626 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9cd8845e -s ours am: 5a07a684 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3f219832 -s ours am: 70c9de68 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f1ffe64 -s ours am: 95025e6e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a16d7197 -s ours am: c4d7b60f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 598f6f57 -s ours am: 3b8a758b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09a86713 -s ours am: a184e981 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19bfe279 -s ours am: 74770b04 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c3e8ecb7 -s ours am: 18e07e33 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7710db36 -s ours am: dbee3a5d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34c17cd5 -s ours am: 44f7bab4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ded6f61b -s ours am: 2cd782cf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fa6f6d03 -s ours am: 985c0810 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 689232da -s ours am: 6eec5ab4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbfb6b37 -s ours am: 1c4b52dd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe56395a -s ours am: 831c28fc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 86ba379e -s ours am: da51b047 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750a7444 -s ours am: 3485a45f -s ours