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

Change-Id: I44308cc36bf4f3dde8fe34cd0e225914fa3d602d