Merge \"Fix unsafe concurrent access in LegacyTypeTracker\"
am: ee4c8fb9eb

Change-Id: I928b2c6ef8e20e197425c214242287185a9daa06