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

* changes:
  Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf11
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: 14b51e0e37 -s ours