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

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

Change-Id: I4e5739a3679d650f82644f66555c1fa2c10ef789