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

Change-Id: Ibce4fc5c1285b302e50d808623de6836b6237c66