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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2fe07c00 -s ours am: 48beb4cf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5089e10 -s ours am: 38727637 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9ce8a711 -s ours am: 4739c448 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80e0cbe0 -s ours am: 8bae8a9c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b3606e1b -s ours am: e1931e67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02208b73 -s ours am: 77225a52 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5dd76e53 -s ours am: e748854f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 06e2c63d -s ours am: ee99068f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7a67efa0 -s ours am: e0ae21e5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89c26106 -s ours am: 691a7a77 -s ours