Rubocop fixes

This change fixes some rubocop complaints.

[#52860123]
Merge 52860123-rubocop to master

[Completes #52860123]