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

Change-Id: I52be9c2c3a2a242c1b3bbea371248e210782b32a