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

Change-Id: I37cd6967159c29d209e1f97a750d9d8508fcd466