Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48d780c  -s ours
am: 765e704  -s ours

* commit '765e704e96be51de891c2623f82fffc9dab3d202':
  Import translations. DO NOT MERGE

Change-Id: I51d831b5a6c4a8272abc71afdabd7bdf178096f6