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

* commit '97360f90ce2015f56b860692dabe0aa82786a888':
  Import translations. DO NOT MERGE

Change-Id: I0cb6ae304f8c8980d5c3f78773e20aa354a02940