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

Change-Id: Ic3a26c3fa5e0ac0762eb79b29b23f72c82b5bb74