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

* changes:
  Merge changes from topic "presubmit-am-9775583256df468cab6420b6719fce49" into sc-qpr1-dev am: 761f529f3a
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3e7b073541 am: ecc5380e16 -s ours