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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 83593852 -s ours am: f20ec298 -s ours am: 8a300a43 -s ours am: d0695e78 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b87 -s ours am: 6aa3b0a3 -s ours am: 617be829 -s ours am: d8f919c2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2a -s ours am: cb2cb2e7 -s ours am: d1f25e52 -s ours am: 6ec6ae29 -s ours