Merge "Revert "Try to set endpoint identification algorithm if available"" am: 4ea3352f81
am: fd9a673fd6

Change-Id: I7621a02f804947c11d1c1f0937d02440544cfa6a