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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b9f89ecd06 -s ours am: 57690899f3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 600d52a0bb -s ours am: 1d302893f1 -s ours