Merge #15415 Windows buildbot change from 3.3