Merge gVisor changes bf787455 (automated)