Cherrypick reliability tweaks for GCE deploy