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

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

Change-Id: I5d0681a2ef5b828b00ac93ad4112535491e84156