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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e59772 -s ours am: f4cd4b3e -s ours am: 26c64d0f -s ours am: 61f8ab90 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3775e246 -s ours am: 917e5c69 -s ours am: 3792be96 -s ours am: 48018d06 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1075212 -s ours am: 76e53571 -s ours am: f924935a -s ours am: b649de8a -s ours