Merge changes from topic "am-4aa91c5e487f49d48ff3c19e39689ce5" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbced2cf -s ours am: f7ec5ae7 -s ours am: b19800b5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70c92596 -s ours am: 8b7f1146 -s ours am: 9913fbe6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3dc1b0a8 -s ours am: 01bd0674 -s ours am: 1065fc1c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bab23611 -s ours am: d67bf29d -s ours am: d28b2adc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 77322015 -s ours am: f5867244 -s ours am: 2652f8cd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad1f8aa4 -s ours am: 3673ef67 -s ours am: 7500daa2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55048229 -s ours am: d112fbde -s ours am: 947f30c5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49558140 -s ours am: 34cb03c3 -s ours am: 7abb8218 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 21a2216a -s ours am: 941863f0 -s ours am: aa4d9d10 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fcca8742 -s ours am: 375f1e63 -s ours am: ee69a053 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8bcf270a -s ours am: e0a16dd6 -s ours am: 1df27194 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efbedbc5 -s ours am: 80a939e8 -s ours am: a2da676a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ae6c4209 -s ours am: 25d12c0f -s ours am: 77f94643 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b64a3ff0 -s ours am: 77c1000e -s ours am: 51f2bdd0 -s ours