Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0  -s ours
am: 440199c6c4  -s ours

Change-Id: I09f6c8d03838d659c42ef85c2a201258679346ef