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

Change-Id: I3bc7c180ab44d5884292f87e57337c22f2e8110b