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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4896c61a -s ours am: af986a5f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28b11a24 -s ours am: d9feba6a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 6f772054 -s ours am: 4c663bcb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ca56a47 -s ours am: 465b4245 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: aa6cc323 -s ours am: 5cb53284 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8663454b -s ours am: 289d1d9d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c6807425 -s ours am: 7aebb70f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81809133 -s ours am: 804ae54b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a47ee6b0 -s ours am: 7f005b91 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a90fb331 -s ours am: f5b7198b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c7c272e -s ours am: 4c7e8cbf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a026dc3 -s ours am: 8da07592 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7fa5fd30 -s ours am: da27b4b9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e758a294 -s ours am: 8cd8a7f2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e9b089e2 -s ours am: 92fc57ed -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 238dfb5f -s ours am: d254c8f3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d618267 -s ours am: 32a1a06e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d7453cc -s ours am: e8e9772c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: afa2346b -s ours am: 77f8c93c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: caf7b1a2 -s ours am: 767f23d0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3df6aa72 -s ours am: 51716810 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a838cda1 -s ours am: 076db3a1 -s ours