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

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

Change-Id: I07c0367ff58a8d2852c00b204d72fd7334341dc3