Merge changes I987ab866,I73fa9ca7

* changes:
  Drop dot at the end of service type
  Implement the stop resolution with MdnsDiscoveryManager