Merge gVisor changes 1ec8639 (automated)