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

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