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

* commit '2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b':
  Import translations. DO NOT MERGE

Change-Id: I058751b2d6f3b01944659df2008956518cbef05b