Merge gVisor changes 0d31b3f (automated)