Merge "Revert "Removes EphemrealResolverService and related""