Merge "Allocate GID to use reserved disk space."
am: 145e185ddb

Change-Id: I1ee502f8714d9e78aeca5e5ad9a78c15667722c2