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

* commit '237b52f40c5564a54a1073df6e77f6da93cdab12':
  Import translations. DO NOT MERGE

Change-Id: I6155b21e15e89da4d6a5234a89b7dac3ac005099