Either or both would surprise me, but neither would shock me.
Payton has been known to give up players and future draft choices for top RB's and OL. Edwards-Hellaire and 2-3 good OL should be there at 24 or in the 2'nd. I'm guessing Payton is coveting a better run game to help the defense and protect Papaw.