Was not fully removed in ag/26414526. Bug: 327517842 Change-Id: Ia147e754547a73ff63d877eb6ef86794f3dd0250 Test: Compiles