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

* commit '593919fde02daecda7ddf78b0a48636d1a7c5c5a':
  Import translations. DO NOT MERGE