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

Change-Id: I77a1073dd366e3994cfb90d07150e2f20534cf94