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

* commit '6766e09a9a2a52a507001b62ff655fff606e0816':
  Import translations. DO NOT MERGE