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

* commit '5f6a4222815abe478045d81d71f65c75ff2cbbbd':
  Import translations. DO NOT MERGE