Merge changes from topic "am-57e0d74080e946758c2b4cbce9ad25bc" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c5388 -s ours am: 3de5617a -s ours am: 7f6ae241 -s ours am: 688597e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca -s ours am: 2036b187 -s ours am: 082d0f39 -s ours am: 2c9fda98 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d -s ours am: 72227214 -s ours am: 868a03b2 -s ours am: d11e1a39 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27c -s ours am: 26d22ef0 -s ours am: 59bb14f5 -s ours am: 6e565398 -s ours