[automerger skipped] Merge "Let DnsManager fill in LinkProperties for private DNSes" am: 59e139a767
am: ce9434a9a2  -s ours

Change-Id: I7a0f888a7f5f0e7424f6ad01fe155bbe48089b87