Merge "Add APIs for discovery with a network request"