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: 465835fe16 -s ours am: f4d8f79a17 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b085068458 -s ours am: b2cb10de86 -s ours