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

Change-Id: I263e31164f030eaf6144c5e3950b9ac085f69572