Merge "Allocate a GID range for external cache files." into oc-dev am: 1d9f6d9c24
am: 0996bb87f4

Change-Id: I07efbf6e2f62f51053d7d1018aaeddcdd8eedaa1