merge revision(s) da05c1552ee519d8f180b48d97148d28501acb35: [Backport #16749]
Update to ruby/spec@cc7b9e5
merge revision(s) da05c1552ee519d8f180b48d97148d28501acb35: [Backport #16749]