Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d  -s ours
am: 712c2cb2d2  -s ours

* commit '712c2cb2d24d08b6a2d8d9344609be67542002ef':
  Import translations. DO NOT MERGE

Change-Id: If524e5fbedf965b7bb6c0bf04e188c5f2c9de9b8