Coding standard fixes

Urvashi Vora requested to merge issue/entity_quicklook-3160054:urvashi-coding-standard-fix-8.x-1.x into 8.x-1.x Jun 16, 2022