Merge "Move EphemeralResolverService" into nyc-mr1-dev