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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3d29ee64 -s ours am: 8cd3075c -s ours am: 98cc2f7a -s ours am: f9dc5bba -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6eaa0d21 -s ours am: 654ca51b -s ours am: a641ef4c -s ours am: 1296595e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8d38d749 -s ours am: 80a7adae -s ours am: 4316a698 -s ours am: a55e122b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c481f1 -s ours am: 87eb89da -s ours am: af3efb60 -s ours am: cb90bc55 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5d67b852 -s ours am: 6d6b462a -s ours am: cddaff8e -s ours am: 52a800b0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dfe22c52 -s ours am: 95c4adcd -s ours am: 2b275ac7 -s ours am: dca8aa92 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e49a398 -s ours am: ff605124 -s ours am: bdb8ed6e -s ours am: 3137faa1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 482694b2 -s ours am: c903add2 -s ours am: e32094fe -s ours am: ec406696 -s ours