Rubocop Fixes

This change fixes a problem found by rubocop.

[#64406114]
Merge 64406114-cloudfront to master

[#64406114]