Merge changes from topic "am-83b6c5c4674140e98078dbf0aa8c8cc1" into sc-v2-dev-plus-aosp

* changes:
  Merge changes from topic "am-396da171ad8a43c0aee8ffda5735e69a" into sc-qpr1-dev-plus-aosp am: c4470ea6be
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62d94f1c53 am: 75c6650af6 -s ours am: 6477e47311 -s ours