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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 031c23e0a9 -s ours am: fa709fddd6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc09ac7f43 -s ours am: 65e5f8d794 -s ours