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

* commit '09aa767fe13442e50d09adfa00ad595aa095f2c4':
  Fix unknown call logic for multi-endpoint.

Change-Id: Iaeb6654c556104faa98d235e151bbd7dc5a162b4