e2074f01c0
- Also remove references to deprecrated compat class Bug: 206932656 Test: Presubmit Change-Id: I1add65b0fe03dedea872d162e51095bf9c648acf