Fix more offload edge cases (#25342)

Commit

2 years ago

Fix more offload edge cases (#25342) * fix * fix * fix --------- Co-authored-by: ydshieh <ydshieh@users.noreply.github.com>