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

* commit '2799ff8a4b88a7f61978bc186259009915b42b29':
  Import translations. DO NOT MERGE

Change-Id: Iea3ea6f375f87f0879577155226a8cb4df9da844