Merge "Revert "Fix optimizable package filter""