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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba0643 -s ours am: f3392e54 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787b -s ours am: 27207b8b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a69 -s ours am: 055f0b6e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd07544 -s ours am: 108e9643 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731 -s ours am: 9638eb73 -s ours