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

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