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

Change-Id: Ic84230a9496f7f183d691366183eaa0c96ff75f7