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

Change-Id: Ia169ee5b8b79c91b0d1c08e4ff180c4e79bcf250