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

Change-Id: I495ab1285df32ffdbc39a03b6c2d94ccb8271622