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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 682f7972 -s ours am: 5ea07842 -s ours am: b0838625 -s ours am: 3139905d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 843d5f61 -s ours am: adc99d72 -s ours am: d24caaa2 -s ours am: b2664462 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 83d3e919 -s ours am: 60626158 -s ours am: ec6c2534 -s ours am: e88d7f9d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e5b5028 -s ours am: 2d95f06b -s ours am: 524f9040 -s ours am: 2d8cf344 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 45923d94 -s ours am: f56e4c69 -s ours am: cf56f0d6 -s ours am: 2c6eac9a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79f31794 -s ours am: 80292948 -s ours am: 950b83fb -s ours am: 026824f1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: c99a4dbc -s ours am: caa1d885 -s ours am: d3d5c154 -s ours am: 524812ae -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0da6afe4 -s ours am: b553b315 -s ours am: d492411c -s ours am: c97cdaf8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 37c6e509 -s ours am: 8b8fa57c -s ours am: 93d6b7e4 -s ours am: 8af3fae6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 555695fe -s ours am: 29123d30 -s ours am: a2cf9e44 -s ours am: 29a9ee33 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ed55f0 -s ours am: 61970fa8 -s ours am: 19fe70c2 -s ours am: 308ff473 -s ours