Merge "Move EphemeralResolverService" into nyc-mr1-dev am: 9d9621f472 am: dfa6488304
am: a513a86e72

Change-Id: I1c80cff6ea9d4eb5342144a9f9fb18c65b2356b9