Merge "Remove use of ILLEGAL_ARGUMENT in hostEndpointDisconnected"