Merge "Allocate a GID range for external cache files." am: edaed3ed7a
am: 28e0eae769

Change-Id: Ib3fd9c570e3885971b79e76804f440f7ed618bc4