Merge changes from topic "am-93ebdb9c83cd4ab99a7cb222f03a27b2" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5df274cdd9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38aa091bb1 -s ours