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

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

Change-Id: I06041098fa6286f7da52a7495c4db383ad9a93d8