Merge "Define range of GIDs for cached app data."
am: da94f09e22

Change-Id: I5db07df01d02b7612d89bca226536cc6461d44b0