Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6  -s ours
am: 6ed0a2869f  -s ours

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

Change-Id: Iec9405a2c6a1a7e600417733c245518ef67bd107