Merge "Modify onHostEndpointDisconnected to always return OK"