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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cc9f9280 -s ours am: 4415aeb9 -s ours am: 9aefd9ae -s ours am: 6b8048af -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 259c1605 -s ours am: 3cedb830 -s ours am: 8d40c5f0 -s ours am: 5f16036e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bd67b857 -s ours am: 38f37a79 -s ours am: 753b57b9 -s ours am: 85bc911c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65f2e454 -s ours am: 95dce899 -s ours am: 501ca60e -s ours am: 58906012 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d11c19ee -s ours am: 08676fc5 -s ours am: 7daf8d31 -s ours am: 9d89e843 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ee61bde -s ours am: 9b748c30 -s ours am: 001f9353 -s ours am: fb385db6 -s ours