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

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

Change-Id: I654dff9f038850ab269dc89c3c4bdbee3408aad2