Merge "servicemanager: explicit addService errors"