Post-release 7.0 merge to master  (#6836)
Post-release 7.0 merge to master  (#6836)


firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk