Merge "Tethering: Fix hidden API selectBestRoute"