Re-add two auto-deleted line during cherry-picking