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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 18a1080a -s ours am: df3a6dc4 -s ours am: b9bd6e01 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ab5fe86 -s ours am: c51fa9ee -s ours am: 93cb286f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3626e856 -s ours am: 412ea5a7 -s ours am: 80e3cd70 -s ours