Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: bf97e34678  -s ours

* commit 'bf97e346786042f09220356346f964ba2f2f857b':
  Import translations. DO NOT MERGE

Change-Id: I8e1d043079e68b20c9de3d186916eca7938d4a71