Merge changes from topic "am-396da171ad8a43c0aee8ffda5735e69a" into sc-qpr1-dev-plus-aosp

* changes:
  Merge changes from topic "presubmit-am-ebb30f757e84472c86693a80953f851a" into sc-qpr1-dev am: 8491a267f5
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62d94f1c53 am: 75c6650af6 -s ours