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

Change-Id: I9ae39a29a86d5706e1a9ae18f5a0cefff3406fd8