Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 29f7837  -s ours

* commit '29f7837cf023414070d8a68034d99b9badb18fac':
  Import translations. DO NOT MERGE