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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: a01d6d77b9 -s ours am: 5b937dca0a -s ours am: 12cd1f2243 -s ours am: 1f69276655 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5534606031 -s ours am: c81a846b0a -s ours am: 9825514781 -s ours am: 2db41ec91f -s ours