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

Change-Id: Ifa08ba7af9b6ffd58c95cdc1bbc40638b8433748