Merge "Fix bug for temp-service-delete"