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

Change-Id: I9fd24b40927e1464902923a54f0bbebdbc13fa2b