Merge "Fix unknown call logic for multi-endpoint." into nyc-mr1-dev
am: 7e8845b35d

* commit '7e8845b35dae58371f81331033212e76ebc58612':
  Fix unknown call logic for multi-endpoint.

Change-Id: Ie352bab72cbdc80b18b0eb24243253e7d88dfbd9