US build tweaks. Do not merge.

Change-Id: If7f369078f5e1b559a2ec2aa9429f3759e037ba4