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

Change-Id: Ic3a96ac86f24e2c15a1710f26a8248cf3f4220c0