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

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