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

Change-Id: I9cc0d048ec0185cdb7e4a69f6d75640fc22390ab