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

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

Change-Id: Ife2d19d87b06863ed5743a516959a5c3d84e56b2