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

* commit '840d8f1446c4d1519cb3c1138ea45b7936e6cfc7':
  Import translations. DO NOT MERGE