Merge "Revert "Allocate GID to use reserved disk space.""
am: 7c06d2c79a

Change-Id: Ic9a6a9048ab796833b9a765d4270184efe5ba35b