Merge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46 -s ours
am: 67aa5e6 -s ours
* commit '67aa5e68b0357d96c3b588c6a9ad37a073e20d1d':
Change-Id: I956bdfc597e80a34f5fcdd92361fa55606fc5cfe
This commit is contained in: