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

Change-Id: I6800e94bd8ca728af636dc0b46768bee708c6236