Merge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev