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

Change-Id: I541762f612f82be52150420791472159586c9062