Merge gVisor changes bd98be5 (automated)