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

* commit '03add50400607c9b5eac983c9a95715e46da6328':
  Import translations. DO NOT MERGE

Change-Id: I6cca1aef8e6dde1b80cad767288d016a97818aa6