merge #16561

Fix lint in #16561