Fix rubocop errors

[#59344580]
Merge 59344580-rubocop to master

[Completes #59344580]