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

Change-Id: I2fa02988a5341ac04c96f87389195349e71cc83d