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

Change-Id: If842604b9a7f29fa0896ab1c7921fed6fa4b6990