Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 585dc0665e am: 212e497cbc

Change-Id: I77fdf03484bd0da36ebffd025a33ab4859a0a5a2
tree: 31379d9c54fbfa20506b3614587ec6410274d4bf
  1. core/
  2. services/
  3. tests/