Override static in return types with self in final classes

Override static in return types with self in final classes #26681