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

Change-Id: I55132b678aa074c4f32794291208c794dc349a4e