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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3d18a8e0 -s ours am: 7ac3be0b -s ours am: 9c674f15 -s ours am: e58d2150 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7703b68a -s ours am: 6bceaf1a -s ours am: 9441a49f -s ours am: 353334be -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 96120cae -s ours am: 7dab85c7 -s ours am: f6c18ca0 -s ours am: 028f00d5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19bbdcdc -s ours am: d2f0c35a -s ours am: 92ccfb04 -s ours am: b86864ee -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8ffa5043 -s ours am: 70f29cd1 -s ours am: 38854c19 -s ours am: 2c5faf79 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0af863da -s ours am: 35eb9ee9 -s ours am: 1d2b88f9 -s ours am: 8b6701f8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e969989b -s ours am: bbf1d14d -s ours am: 46958dba -s ours am: 47df750c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0052d1a7 -s ours am: c0dd9bcc -s ours am: 088677a1 -s ours am: f9fd7e2e -s ours