Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5ee8a49  -s ours
am: 39e383a  -s ours

* commit '39e383a171e4bc949131fef9a9893874ff4cc5c7':
  Import translations. DO NOT MERGE