[ Windows ] More Windows test gardening to get bots green.