DO NOT MERGE Add support for multi-endpoint. am: ad944e7cf2
am: 13d8c54350  -s ours

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

Change-Id: Id1aa700a5fc02a93f7eee1dd797de8768791fafe