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

* changes:
  Merge changes from topic "presubmit-am-9edbd92f37f247879be8e4d327e22cde" into sc-qpr1-dev am: afef04e645 am: a9d4d465f3
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6f2f9cd45 am: de0661eb8e -s ours am: c6c82789ca -s ours