Merge "Adding some new multi-endpoint stuff." into nyc-dev
am: a6f12cf

* commit 'a6f12cf3d059b31db6f9119317956ec44b09a76d':
  Adding some new multi-endpoint stuff.

Change-Id: Ia53b795e65a86b58d081fc0222b580fcdd6da9d8