Merge "Revert "Second pass tying into dns cache per interface"" am: 3ed6099b4b

Original change: undetermined

Change-Id: If851e7d7b3812a8d994520c41f771c03236a6b10