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

* commit '35d412a0274fa0192b7633ed5001d4f076633cdc':
  Import translations. DO NOT MERGE