Merge changes from topic "am-7dca2533f9d849dcb4af4d659b14ea39"
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 28a58996a8 -s ours am: ca2d6a2c83 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa53df7eb3 -s ours am: 4253c6809c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2535e6bc1a -s ours am: 49493614ad -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00217c161a -s ours am: 99db3f87fa -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c8f7da1345 -s ours am: 44925306a9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa45862378 -s ours am: 7442629782 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1f210d20a6 -s ours am: d546a270bc -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e14883d20 -s ours am: 91029d9e65 -s ours