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

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