Merge changes from topic "am-23444252224b42a6aecd5ec178f79b45" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 34496ffa -s ours am: fa81e008 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc32f7b7 -s ours am: 4be9987a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9f97be3d -s ours am: 9b58aa3f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ad4a0ec -s ours am: 73bf72cd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e1ad1502 -s ours am: c87433b1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7c658d91 -s ours am: 704ec32c -s ours