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

Change-Id: I798d6deb0c5d3c9e395fd31e1d5b1402aca79912