cherrypick : DNS resolution for linklocal service names

Change-Id: Ie9241ae4d972afa3de3a88b111a98a1c9348a201