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

Change-Id: I2c5809787112d866890e24f35d315c2f944af610