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

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

Change-Id: Ide5118c04f66f5c20ca474cc83c2eb9da3a8ddd1