Merge changes from topic "am-8d63d2b8910f437daba92514334732a4" into sc-v2-dev-plus-aosp

* changes:
  Merge changes from topic "presubmit-am-5f78b5b6b5cb4653b085e1fa983c7156" into sc-qpr1-dev am: 7a655d6245 am: ec8269320f
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 16b2da4980 am: ba4ec8eb6f -s ours am: 342933791f -s ours