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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 62925d70 -s ours am: 6d2a9272 -s ours am: 03d3b9d4 -s ours am: 5e804d25 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04a77d06 -s ours am: e4ec5476 -s ours am: aecc1da3 -s ours am: dd18a39c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: faee8419 -s ours am: b5c4e688 -s ours am: 862ea47d -s ours am: 6913cc56 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f96062a -s ours am: c92d8a20 -s ours am: 1b3d398e -s ours am: fc7aa2ab -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f64d100e -s ours am: 1e652813 -s ours am: cc078b07 -s ours am: dbcc59ed -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 394b3f09 -s ours am: 1b2c5319 -s ours am: d0281785 -s ours am: e80a05f9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2b1c8664 -s ours am: 3ab65296 -s ours am: 608f3c2e -s ours am: c271b445 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ec64b65 -s ours am: 98862b09 -s ours am: fc48ba67 -s ours am: b8f75ef8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e8663653 -s ours am: 37f83e88 -s ours am: 99dfe728 -s ours am: f84cfd9b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9e77685 -s ours am: ff7de590 -s ours am: a0549e27 -s ours am: 64ad2591 -s ours