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

Change-Id: I909f8334846a92370d136722d1aa8eaa1aa162ca