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

Change-Id: I3309e45435c80a2265685e456204faf73ed8fa36