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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: eafebaeb -s ours am: a1c0f0f0 -s ours am: 3b027c63 -s ours am: 4ba8f105 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0bab9e3e -s ours am: cc7d54b7 -s ours am: 8e570cfc -s ours am: 31ccea9c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ea7de377 -s ours am: 2826b7a4 -s ours am: 6234e9c9 -s ours am: b92032bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f329b875 -s ours am: a7d9c4f4 -s ours am: 76ecd4a5 -s ours am: a70f1b09 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2c1a10c9 -s ours am: 506a319d -s ours am: 42290450 -s ours am: 0bac73fc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7a182ad -s ours am: 9e0eb0d5 -s ours am: a25ee1b4 -s ours am: a3a1e9f9 -s ours