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

Change-Id: I711e22ef0d10409d81c1ed4352876697797b95a8