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

Change-Id: I42f666adec4ad973f5a66aee72b83b5ef7886f78