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

Change-Id: I097ff975b7a35a9d932e332c6ce63fec3c31da91