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

Change-Id: Iac1b2c85d627ae266723d9bafffa4aa77c00864f