am b9f87f19: Merge "First pass tying into per-interface DNS cache"

* commit 'b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
  First pass tying into per-interface DNS cache