Merge changes from topic "am-7dca2533f9d849dcb4af4d659b14ea39"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 28a58996 -s ours am: ca2d6a2c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa53df7e -s ours am: 4253c680 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2535e6bc -s ours am: 49493614 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00217c16 -s ours am: 99db3f87 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c8f7da13 -s ours am: 44925306 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa458623 -s ours am: 74426297 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1f210d20 -s ours am: d546a270 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e14883d -s ours am: 91029d9e -s ours