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

Change-Id: I6785959fc5131f6cde32be0b960b26015fdc74c5