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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: fef13a71 -s ours am: b7b379da -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d9801fb -s ours am: 7a902428 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4f940a17 -s ours am: a903588d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d13d3c0 -s ours am: 93805b04 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 52a39334 -s ours am: 288fd779 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 810ed7e3 -s ours am: 8c768fdf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 949661da -s ours am: d4670a5c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22bf769a -s ours am: d9a110d9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 96ab3b37 -s ours am: 15c9d8c7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 535d8de1 -s ours am: 1d149094 -s ours