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

Change-Id: Iff3609179536b7e76d0f2a0b221636d86f7b6a51