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

* commit '0705a5136ede23cee4c1a9e16ebe98edf9525930':
  Import translations. DO NOT MERGE

Change-Id: I0264b7c49fbcd502315e6bce658e103f7ffb36d3