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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9f57d7c3 -s ours am: 177e51f9 -s ours am: 09b9b0a4 -s ours am: 029576ed -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a04b7411 -s ours am: 99821d0d -s ours am: 0cbb4be4 -s ours am: 309cff4a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 358df3b4 -s ours am: 6e463b4b -s ours am: e6474eb8 -s ours am: 1df85d94 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff47ad72 -s ours am: 85aa1c74 -s ours am: ee6a4771 -s ours am: 35085d0a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 26345881 -s ours am: a14d9cc0 -s ours am: 4a066769 -s ours am: a811577d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89ad33d3 -s ours am: 00039e11 -s ours am: d37cb0c6 -s ours am: ed085c3f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc88de15 -s ours am: 180049ef -s ours am: 7fac07b3 -s ours am: 3ff619df -s ours