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

Change-Id: I2b913190f77c1351e1b776f2bb319d550af309e3