Merge gVisor changes cabda0e7 (automated)