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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ca05bc8f -s ours am: 36f16a2f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3df0a122 -s ours am: ff86f033 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f6bae2a7 -s ours am: 279f827a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e30ffeb -s ours am: 6d20d224 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8d6be24e -s ours am: 9d9ef57c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c6b6f499 -s ours am: 6d6ef46b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0b8b3fc5 -s ours am: b4db80c5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60a26a3f -s ours am: 21cc6422 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d2dece14 -s ours am: 7e08bf26 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4a50d2d -s ours am: 65ca6f28 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9f935846 -s ours am: 015ea95a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10143abd -s ours am: d29f634d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81181ccc -s ours am: e0612ca3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6007ddd -s ours am: 06b2dc93 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4cd08413 -s ours am: 8cbb7db9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88481d72 -s ours am: 45a57909 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 999b5547 -s ours am: 5d169f28 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a97761a -s ours am: 58729a07 -s ours