Merge "Fix typo in HostEndpointInfo definition"