Merge "Add per UID interface support to resolv cache"