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

Change-Id: Id59857a2980ee9d3a3b985d1027fd61dfb1ade4b