Cherry-pick two 6.34.0 commits to master#6688

paulb777 merged 2 commits intomasterfirebase/firebase-ios-sdk:masterfrom

pb-merge-spmfirebase/firebase-ios-sdk:pb-merge-spmCopy head branch name to clipboard