Merge changes from topic "am-972234a1128d41e38f2888eefcea5f48" into sc-qpr1-dev-plus-aosp

* changes:
  Merge changes from topic "presubmit-am-fa6802abdeff4b8ea35356d58a58bda6" into sc-qpr1-dev am: 5f90e5cdbc
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b5c9411929 am: 0c652cdb66 -s ours