Merge "Fix a race when removing from LegacyTypeTracker." into mnc-dev
tree: c8b50c866ae1263552d3e2f7261d28d908e2cce7
  1. core/
  2. services/
  3. tests/