Merge "Cleanup LinkerTest leakage between provider entries"