Merge "Remove BaseV*ImageAdminTest class"