Merge "Make LegacyTypeTracker testable"