Cherry pick PR 35306 and 35336#35339

shunping merged 2 commits intoapache:release-2.66apache/beam:release-2.66from

shunping:cherry-pick-35306-35336-second-attemptshunping/beam:cherry-pick-35306-35336-second-attemptCopy head branch name to clipboard