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: 8204af7f51 -s ours am: 3a6ea4cd51 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3179b9a593 -s ours am: 8ca90ce1cb -s ours