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

Change-Id: Id84adf98244b231a35450cd6d8ae7194d475c202