Merge "Try to set endpoint identification algorithm if available"
am: 14a4a6123f

Change-Id: I5514b380c1dbfe897011817985e942a1a8e3abb4