Finalize Multiendpoint functionality.
am: a449435441

Change-Id: I33072460a73fbad4dac8773ff2961bf49e480e51