Merge "Second pass tying into dns cache per interface" am: 75c17e5f38

Original change: undetermined

Change-Id: I71f20a1aaab51c39ffa50c235fd071f01dff3dab