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