Merge "Make LegacyTypeTracker testable" am: 54cedaca89
am: fd22a78946

Change-Id: I53457ad6af430c551c6909a7e68127a3667efde9