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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 720416a0 -s ours am: 68e84d4c -s ours am: 609f04a4 -s ours am: 5f99a8d1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 200261fb -s ours am: c1bdea66 -s ours am: 40958e91 -s ours am: 25e63afc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cdfe9ecc -s ours am: f2689642 -s ours am: afb7ad7c -s ours am: 0352e6b7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5610aa5b -s ours am: 4624a25b -s ours am: 7c242371 -s ours am: 4ec7fd4c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6ab71ada -s ours am: 71393116 -s ours am: a5e6f772 -s ours am: 674f5b85 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8bf40d82 -s ours am: f5063526 -s ours am: d9f8e9b8 -s ours am: c33c1d6f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: a5de24b8 -s ours am: 7fb70ba7 -s ours am: 3469372d -s ours am: a627724f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e3a1501 -s ours am: 47e73f9c -s ours am: 7ff554b6 -s ours am: 18b2c58f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: a5a2fb19 -s ours am: 84305151 -s ours am: a6ef209e -s ours am: a2a34429 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0c78808 -s ours am: c882074c -s ours am: 945d4113 -s ours am: b5fc165f -s ours