Merge #16167

Just some lint fixes for #16167