Merge changes from topic "am-35ba34b55c0141f9a02132b563af0c28"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33 -s ours am: c364a011 -s ours am: e0ac8c3a -s ours am: 44f52460 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604d -s ours am: 10c17985 -s ours am: f0a5a877 -s ours am: 03954aa5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a -s ours am: 410e8ac5 -s ours am: 7c2ebdf0 -s ours am: 0f4054f1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2 -s ours am: 21c40c2e -s ours am: 21e2a174 -s ours am: 4579cbd0 -s ours