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

* commit '7533f3260e888c6edc709b02eafdb5722172ecc2':
  Import translations. DO NOT MERGE

Change-Id: I8bb034309c4319df4caa65ae7b8124cb49ccb414