Ability to pass along multiple endpoints

Change-Id: I6a24333ec530cdc804663d26266c606a611d0864
Merge "Ability to pass along multiple endpoints"