Merge \"Fix unsafe concurrent access in LegacyTypeTracker\"
am: 02a0bce25a

Change-Id: I928b2c6ef8e20e197425c214242287185a9daa06
tree: 65ee9a21477c2a9a5b1e92d76432847c2c943e80
  1. core/
  2. services/
  3. tests/