Holiday lint
Merge pull request #19282 from cachedout/lint

Holiday lint