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

* commit '87d8136f89f433f5bf5962c8a32b02250492b316':
  Import translations. DO NOT MERGE