Merge "Depend on services.core instead of services to fix coverage build."