Cherrypick PR 35306 and 35336#35338

shunping wants to merge 2 commits intoapache:release-2.66apache/beam:release-2.66from

shunping:cherrypick-35306-35336shunping/beam:cherrypick-35306-35336Copy head branch name to clipboard