Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp

* changes:
  Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a69a44f7a -s ours" into udc-dev-plus-aosp am: a1ad7700bd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a69a44f7a -s ours am: d4c74840cd -s ours