Merge changes from topic "am-91bc65d57b824eeea7b1c486eaa2e63f"

* changes:
  Merge changes from topic "presubmit-am-c77a0e3c5b914a1badbb2383c95ada3d" into sc-v2-dev-plus-aosp am: 330d5eadef
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d77e496a67 am: b54302c9f4 -s ours