Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 6e830b854e am: 5b3e7d90d0

Change-Id: I77fdf03484bd0da36ebffd025a33ab4859a0a5a2