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

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

Change-Id: I60b392a483edc613eb67dab08038631d9db06100