Merge "Add clearing of resolv uid and pid interface maps"