Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8437fce56d  -s ours

Change-Id: Ia70f51adc96f98491dc90cdf12ec220d486f4426