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

Change-Id: I40a278fefe8891467e6b7e3f01a1f18514b85fb0