Merge "Revert "Revert "Prevent side channel package installation enumeration"""