Fix CI failure caused by df84e9867219e9311aef6f4efd5dd9ec675bee5c
#26253

kamipo wants to merge kamipo:fix_ci_failure into rails:master

We do not currently have an analysis of these two commits