Merge pull request #9120 from soltanmm-google/if-you-run-away-from-things-it-just-means-you're-going-to-see-them-again-when-you-wrap-around-the-universe

Fix Python setup-time diagnostics