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

Change-Id: I1d774f175bfff7e90b9253fe84222964f5d97677