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

Change-Id: Ib5e9579d28d84fa2fa26910fb6857b06b2d09560