Merge \"Finalize multiendpoint functionality.\" into nyc-mr1-dev
am: b489d6c2a1

Change-Id: Iaf8e0b5957036a7c62a10d77bed86814ea8a67a8