Merge pull request #31489 from BhargaviGudi/skip-api-hypershift