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

Change-Id: Ifc9736f4ab3940ad48e16691d3d0cae33adea315