Cherry pick lint warning