Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1e4d3e94 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e64c1c0b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3bec79b7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e72840d7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8b6afb20 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 804c276a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f986eec2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 389929df -s ours