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

* commit '41a1d11f98d170ed41935d35fc1a3ed4af2c59fd':
  Import translations. DO NOT MERGE

Change-Id: I2e0d39f64f0ebd738cad7d7676eb809f1fe88db7