Merge "Import translations. DO NOT MERGE" into nyc-dev
am: ae284e6cb6 -s ours
* commit 'ae284e6cb643236be307e78960e976d8266e8d2c':
Import translations. DO NOT MERGE
Change-Id: I65d0bb4ce8a10499a43e5935ccffca9bdcf42d0a
This commit is contained in: