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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d096b075 -s ours am: 4ec2421f -s ours am: 5fb7617f -s ours am: f98ca530 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0518e121 -s ours am: 219874c7 -s ours am: 8cd4fac3 -s ours am: 6c97c3ff -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 30f00bc2 -s ours am: 216601ac -s ours am: cfaf1515 -s ours am: e17f61f3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ad153ba -s ours am: 4387adb5 -s ours am: 48651e93 -s ours am: 814b7f07 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1879356c -s ours am: e89d9507 -s ours am: 0a2c1c52 -s ours am: 8175eb60 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e7099f7 -s ours am: 308effb3 -s ours am: 752d8193 -s ours am: 6a2fdd5a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2a295bf2 -s ours am: f02c44d8 -s ours am: 83156461 -s ours am: 58f9bb28 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 482d77f5 -s ours am: 5b20f2c4 -s ours am: f77a06bb -s ours am: 7f332524 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0c118168 -s ours am: fdf64bbb -s ours am: acb2cbee -s ours am: d48a0ae0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 603c640f -s ours am: 2f350572 -s ours am: d8e11d55 -s ours am: 82a4807d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e403bf69 -s ours am: b9acea9e -s ours am: 650a1e15 -s ours am: 0af2fc2e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 556dc213 -s ours am: 2ac2afba -s ours am: 840f3830 -s ours am: b6fd4394 -s ours