Automatic merge from submit-queue Fix compile error on non-linux platform Fix #35252 cc/ @smarterclayton @spxtr