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: 138ee000 -s ours am: c5d09db1 -s ours am: e48537d1 -s ours am: 64d7059c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fc6315b -s ours am: 21954666 -s ours am: 3551812a -s ours am: d638f16e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca3a25c9 -s ours am: 38da1316 -s ours am: a91ae9e3 -s ours am: c87def00 -s ours