Merge changes from topic "am-9fb9beb6688a4872a6b4ecfa58dcc1ab"

* changes:
  Merge changes from topic "presubmit-am-b88ad1a15ec3469ba54217acf09083f8" into sc-v2-dev-plus-aosp am: c001d22739
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ebbd62bbb am: 0c948128c4 -s ours