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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 465835fe16 -s ours am: 9643134b4e -s ours am: 7e89178ac9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b085068458 -s ours am: 8b15100a62 -s ours am: cfeec3f253 -s ours