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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b36 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a84 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1 -s ours