Merge "Implement the stop resolution with MdnsDiscoveryManager"