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

Change-Id: I93855bfa75cc031fe4e4d1812c415ae359a34b5b