Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours am: f12e2ee361 -s ours
am: 1ee6221214 -s ours
* commit '1ee6221214a14665ddb2ed38a2abdd509491d964':
Change-Id: I4ff08b3d33046f3c93b5952db2ff2c66f57051e1
This commit is contained in: