Merge gVisor changes bfc12ee8 (automated)