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

* commit '05be3b454134afc73ae44cda88af10bead5324a6':
  Import translations. DO NOT MERGE

Change-Id: I94238461acc288413140d20799142aba4dd7c353