Merge "Only set mdns_registered on success" am: afd3dfeeff am: 4891c3a465
am: 1c70a3adc3

Change-Id: I0a36d395671e3f605e2bdf7489349c890baa9e67