Merge "Add toString to CallServiceDescriptor" into master-nova