Cherry pick #8977 for temporary release#9031

hsubox76 merged 1 commit intoat-11-7-1firebase/firebase-js-sdk:at-11-7-1from

overlay-cherry-pickfirebase/firebase-js-sdk:overlay-cherry-pickCopy head branch name to clipboard