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

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

Change-Id: I8a7371d3675a9e4ee5c05294f2b535865939fbbc