Use native collections in TypeDataStore and related classes (#10937)

Change-Id: I6762c9411119ea3a363d2a605f71d20871d73209
Merge "Use native collections in TypeDataStore and related classes (#10937)" into 7.0