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

* changes:
  Merge changes from topic "presubmit-am-8eede051c5d84583868b44f7dd92ffd1" into sc-dev-plus-aosp am: e9c506530c
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1a84904d54 am: 20b043671a -s ours