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

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

Change-Id: If0b61398340ffb28f5cb6d5b1dc9e7a0dd5e4e2d