Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5f6a422281  -s ours
am: e91aca7d0d  -s ours

* commit 'e91aca7d0d189ebf6d1df01b503aa6f76e4d7673':
  Import translations. DO NOT MERGE