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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8633f532e9 -s ours am: b357889fdb -s ours am: 66adfaff51 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02432ca7eb -s ours am: 3429b13928 -s ours am: 25006ef898 -s ours