Merge "Revert "Implement the stop resolution with MdnsDiscoveryManager""