Merge "Make LegacyTypeTracker testable"
am: 54cedaca89

Change-Id: I7dd63d9676862d3416ff75b43f2f8bdbce07134a
tree: deea8dd9041646ecac1f344908b497c1dfbc1731
  1. core/
  2. services/
  3. tests/