Merge "Import translations. DO NOT MERGE" into nyc-dev am: 30fc04a  -s ours am: 11055ea  -s ours
am: 6d9ff9a  -s ours

* commit '6d9ff9a7001b6fba37675b34b23384a7745b5437':
  Import translations. DO NOT MERGE

Change-Id: I2337cf41d41450fc5f8a9f69424311cb3d285c88