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

Change-Id: I861d47e86d5695382ecf2e3093e567f710273c1c