Merge "Allow whitelisted plugins on user builds"