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

Change-Id: I57bb5d48154f9eadbe6657d3af6861fc1f673ee9