Fix duplicate cherry-pick