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

* commit '33793c58fae2660cd4270bc0644c4431c50d2b69':
  Import translations. DO NOT MERGE

Change-Id: I7faf31b361d1444424f976c206fb09b08fdee324