Merge "Enable multi-cast while resolving nsd services" into pi-dev