Merge "Define GID range for external data and OBBs." am: 1e7cdf3c7d
am: d150012349

Change-Id: I623a5dc6f23bff66add042241dd9b47ed68f64bb