Merge "Only set mdns_registered on success"
am: afd3dfeeff

Change-Id: I0b065d93cea02aac93fb9b24837f4088c8df1064