Fix blacklist cherry-pick conflicts