Lint fixes for #16495
Merge pull request #16511 from techhat/lint

Lint fixes for #16495