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

* commit 'd41e55f864c4767f883e7333e5451ee505126873':
  Import translations. DO NOT MERGE