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

* commit '767aa9a38c127bf9fb7cbc0e2651815c60ae2bf1':
  Import translations. DO NOT MERGE