Merge "Amend package whitelist."