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

Change-Id: Ie112f5004629cdd2fd0216eaa9b94bf4e45c6928