[automerger skipped] Merge "Let DnsManager fill in LinkProperties for private DNSes" am: 436d7c53be
am: d00fc783ba  -s ours

Change-Id: I7a0f888a7f5f0e7424f6ad01fe155bbe48089b87
tree: 66fdfb8b0dd56fbecfcfa5a4639145b6c63aa3a5
  1. core/
  2. services/
  3. tests/