Merge "Make LegacyTypeTracker testable" into qt-dev
am: ac45adad79

Change-Id: I0572183599ec28d317c5b6ebe56f80f19c965f64