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