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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ca4b237bc7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30e2ac44bf -s ours