DNS resolution for linklocal service names

Change-Id: I9e5625e0c4e68a843f46bd438a3809b1f8e09d20
Merge "DNS resolution for linklocal service names"