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

* commit '9eb610598eb4513969837639509cd4d3115889d8':
  Import translations. DO NOT MERGE