#98702Ensure code follows cgl ruleset
Description
With #98502 code got merged, which does not follow the
cgl rules. This was a overlap since patch was pushed on
gerrit and meanwhile changed ruleset, and not rebasing
the patch before merging. Happens from time to time.