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

* commit '582b69a716910df3519677576d97ef6a3773a8a7':
  Import translations. DO NOT MERGE

Change-Id: I18164badf9769cd8477c23fbfc694a5d9b60df48