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

Change-Id: I6b44a933f9633d70ffb57034a8e8a6d23f8b028e