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

* commit '687ccbbf7145bbb8563a49ca20f9c79f4e789ecd':
  Import translations. DO NOT MERGE