Merge changes from topic "adbwifi-client-mdns" am: a71ba615ea

Change-Id: I621b1667dd42fca057c2ac992bf1fa4f988555af