Merge "Refactor EphemeralResolverService"