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

Change-Id: I2ff90e0c847b2c99099509802e0b5be4eaa04cff