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

Change-Id: I74e4e62cd69d3696698609e010bf08ad86daa0f4