Fix formatting
Call super()
Update ConsumerManager setup to use GoogleDomainDiscovery when appropriate
Remove use of GoogleDomainDiscovery for initial discovery