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

Change-Id: I8dd7395f7b21cc4122a32684d9b641bec33c8deb