Merge "Fix unknown call logic for multi-endpoint." into nyc-mr1-dev