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

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