Grouped EDP endpoints by type

Change-Id: Ifbd56a3964cbbf8e2b2305e75d9f7785871b4e59
Merge "Grouped EDP endpoints by type"