Merge "Revert "Allocate GID to use reserved disk space.""