Merge "Revert "Whitelist packages from VPN lockdown.""