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

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

Change-Id: I26f9657e2be656e885a7b205817b109877c41107