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

* commit '39884131c0e2c5bb73ffe05f6c73631429a33020':
  Import translations. DO NOT MERGE

Change-Id: If0cc730a161f55c3eff9faa14b3718950e940102