Finalize Multiendpoint functionality. am: a449435441
am: aa33390f76

Change-Id: I1717a9f57b7764f1980f12160ed7675d53803a01