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

Change-Id: Ica49d61f60c86b0df9c7e1ad0a55b3d09e6ca7e5