Cherrypicking #35314#35342

ahmedabu98 wants to merge 1 commit intoapache:release-2.66apache/beam:release-2.66from

ahmedabu98:cp35314-2ahmedabu98/beam:cp35314-2Copy head branch name to clipboard