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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5cf0ec20 -s ours am: 4786aafa -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edaa0972 -s ours am: e0791f6b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 529729d3 -s ours am: f3cf8b37 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6c4fdc1 -s ours am: 044ab635 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c614f987 -s ours am: ae89e99f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3d3a361 -s ours am: 8fdeae14 -s ours