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

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

Change-Id: I734c3170108571d7cda4857fcf7ebfe2a55a6a51