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

* commit '1be5477dbe37b940d1269af9b188f7150fad2497':
  Import translations. DO NOT MERGE