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

Change-Id: I829656295916ec3bbd89ff9ca71dad569beca264