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

Change-Id: I6d7dc25257c3c49c357d76063baf52bb16b741b1