Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 741849d5 -s ours am: 57d423f6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a7a0fdb -s ours am: 71bb4b9c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bfd5deda -s ours am: 56e4d4db -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 500df881 -s ours am: 7ba48e07 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: afe51d77 -s ours am: b1ded7d6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1df35a54 -s ours am: 1df9789b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b3b6ba9b -s ours am: 4c5e2e8b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d45ee46f -s ours am: c0bf34bf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9ed9f806 -s ours am: ad540970 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb4f7143 -s ours am: 28564440 -s ours