And a missing override or four. Bug: 78245676 Test: none Change-Id: Ib089a1e4b23ae8bd84b44b4638ee2f505ab760ba