Merge changes from topic "am-87b8927809804de789ee213742e1ade2"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 416f9b7d -s ours am: 91b376e5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89433700 -s ours am: 31292618 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fc0a2125 -s ours am: 14cdee70 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e95535c -s ours am: f5e41868 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 07fd6b7d -s ours am: 5c5c0ede -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 518fbad0 -s ours am: e8df72f9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a8396c51 -s ours am: 5c8d9fd6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c6b5143 -s ours am: acc6608c -s ours