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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2f235996 -s ours am: f7b31ed2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 715f4fe3 -s ours am: 2409748b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a5579d99 -s ours am: 69de47c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5cf8cd9 -s ours am: 9cade420 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 468e90a0 -s ours am: bce46c3d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36efacd4 -s ours am: a8c07a5d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 67b93d17 -s ours am: 91e05275 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d6f860f -s ours am: b2b5fc44 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: caf6e1e2 -s ours am: a15f1d14 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04ef996f -s ours am: aa75383a -s ours