Set the service_type for the builder

If we don't do this we can't lookup the endpoint.

Change-Id: I7eae87afc9e4d9ef9dd4f5877b71a4ebe299df0a
Merge "Set the service_type for the builder"