Merge changes from topic "am-5c76216788a04cc288a6aa7546a5c8d3"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 845bbb02 -s ours am: 02e4067a -s ours am: 67071272 -s ours am: f5200bfe -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9cd8845e -s ours am: 8bf09c3d -s ours am: d5092940 -s ours am: 1254422f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3f219832 -s ours am: 19b5e2bd -s ours am: 963f4009 -s ours am: 24883c3a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f1ffe64 -s ours am: cb9d210c -s ours am: 3b8b29c0 -s ours am: 0301e443 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a16d7197 -s ours am: 0f90802c -s ours am: 213dc526 -s ours am: 1f265ac4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 598f6f57 -s ours am: 454a905c -s ours am: fb91651e -s ours am: 905f4fe9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09a86713 -s ours am: b22bd32c -s ours am: 9758061a -s ours am: 3a849450 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19bfe279 -s ours am: b5966df9 -s ours am: 377105d6 -s ours am: c730203a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c3e8ecb7 -s ours am: 5e4052e7 -s ours am: a5fed092 -s ours am: a7da72f5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7710db36 -s ours am: cf211825 -s ours am: 7fdd5e0f -s ours am: 72f19eb0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34c17cd5 -s ours am: 64720b33 -s ours am: 3bc7d570 -s ours am: b634bd00 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ded6f61b -s ours am: 27c225b3 -s ours am: 2d1bce2f -s ours am: 12315232 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fa6f6d03 -s ours am: ebf4a6be -s ours am: fe66792b -s ours am: 782a97ef -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 689232da -s ours am: adfdf03d -s ours am: cafc03a2 -s ours am: 3521e7a0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbfb6b37 -s ours am: e7f70fb0 -s ours am: 24ed9864 -s ours am: 848fa231 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe56395a -s ours am: 2985ed29 -s ours am: 24a19e7a -s ours am: 47ca58a5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 86ba379e -s ours am: d46676cc -s ours am: b4f266ad -s ours am: f828ba6a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750a7444 -s ours am: 9cc6a6a9 -s ours am: ac88669e -s ours am: 290f3b7e -s ours