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

Change-Id: I92bcafd93bb2c1fe1818415b2f991fd677101dea