Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 53f3a3c -s ours
* commit '53f3a3c8f81d0d33e6a2a31ec9b3203e57dcf419':
Import translations. DO NOT MERGE
Change-Id: I40ff4802211b1700e4537784e2c72a79247f8856
This commit is contained in: