Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9058fc71c2  -s ours
am: 05d64fec0f  -s ours

* commit '05d64fec0fad91a1b1f77414472aeb355d2bd0cc':
  Import translations. DO NOT MERGE

Change-Id: I7be3c41979b23c4c9f1de57596f0b2b0b1bf9da7