Merge "Add APIs for discover/resolve on specific networks"