Merge \\\"Fix unsafe concurrent access in LegacyTypeTracker\\\" am: 02a0bce25a am: 5f8aae1831
am: 064d6efe21
Change-Id: I4986b4646220b9be53f8063f2d5a41a763011a96
This commit is contained in: