Merge "Fix unsafe concurrent access in LegacyTypeTracker" into nyc-mr1-dev