Merge "Revert "Try to set endpoint identification algorithm if available"" am: 4ea3352f am: fd9a673f am: 9c4976e0 Change-Id: Ie6089a6aea26e4d3ca5bb5af3b1c8d74a43586d4