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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c78664766e -s ours am: 7ef4b4a037 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdab72c00 -s ours am: d636ef0772 -s ours