Merge "[adb client] Fix mdns discovery service registry."