Merge gVisor changes 8a81810c (automated)