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

Change-Id: I20a3426002ebe6f4db9de7edf7c4072d0a27dbdc