Merge changes from topic "adbwifi-client-mdns" am: a71ba615ea am: 73447676aa am: 560b4a0c94

Change-Id: Ica35bc1d72ed33a2693166a54893491647cdb12d