Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 002ccec5c1  -s ours
am: ee384436c1  -s ours

Change-Id: Ib0a7054175285a7c5edfd1d8f2b7cc5dc2acdf5e