Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: abbb3a92 -s ours am: d07777ec -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6ecd41e -s ours am: 71aafefb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c7283552 -s ours am: 8074701c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eeff562a -s ours am: 732239e6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0fb126ae -s ours am: ae47f19a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c02a785 -s ours am: c1a4d0dc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8071fc5 -s ours am: beaadd03 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a64fc91 -s ours am: c3ddc648 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c093c81e -s ours am: 75e94e4d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3d8e242 -s ours am: f001be2c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4b0ab9db -s ours am: d01c8e88 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8657364a -s ours am: 1a72c815 -s ours