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

* commit '732a35eb238a1343383aba15febba6adf6cefcc5':
  Import translations. DO NOT MERGE

Change-Id: I9bdf3df8b079c2cab4938d05f66f45d73c637e4a