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

Change-Id: I8d43006be9a1abc13303a2b120d3fe18bfd78302