DO NOT MERGE Add support for multi-endpoint.
am: ad944e7cf2

* commit 'ad944e7cf20303adddd960d8870b47fffcdcc8df':
  DO NOT MERGE Add support for multi-endpoint.

Change-Id: Id4892965363a1c97089e691cc1f639756322f7bd