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