Merge \\\"Fix unsafe concurrent access in LegacyTypeTracker\\\" am: a575de0de8 am: 40efcef1c6
am: e34e29d2ac
Change-Id: I4986b4646220b9be53f8063f2d5a41a763011a96
This commit is contained in: