Cherrypick #31550 and #31602 onto release branch

[shunping]

Cherry-pick #31550 and #31602 onto release branch

---

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

• Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
• Update CHANGES.md with noteworthy changes.
• If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

[shunping]

R: @kennknowles

[github-actions]

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

[kennknowles]

will merge when green

[kennknowles]

This may be red on the release branch:

apache_beam/internal/gcp/auth.py:82: error: Incompatible return value type (got "Optional[_ApitoolsCredentialsAdapter]", expected "Optional[Credentials]")  [return-value]
apache_beam/internal/gcp/auth_test.py:29: error: Incompatible types in assignment (expression has type "None", variable has type Module)  [assignment]
Found 2 errors in 2 files (checked 1147 source files)

[shunping]

right. I think that has been fixed in master recently but needs to be cherry-picked as well. 47d9bca

@jrmccluskey

[kennknowles]

it will make me happy if you will rebase so it can be green for sure (yes, I know it is very obvious and we are confident what the problem was)

[shunping]

Tests are alll green now.

[shunping]

@kennknowles Could you help to merge this?

[shunping]

@kennknowles:

This PR is causing certain internal test failure. If you have not merged that, please skip it for this release (2.57.0).

[kennknowles]

I can cp both. There is time. go ahead and open the other one to cherrypick as well

[shunping]

I can cp both. There is time. go ahead and open the other one to cherrypick as well

The fix PR depends on the previous change. It may be easier to put both into one.

[shunping]

Run Python PreCommit 3.11