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

Change-Id: I40b8c57ed3ae9c832e5e10adda8d7c4319176538