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

Change-Id: Ice223fb53fb56eed6bf06cae771b05d222942b9e