Reapply changes reverted by #11506#12121

facebook-github-bot merged 2 commits intogh/swolchok/487/basepytorch/executorch:gh/swolchok/487/basefrom

gh/swolchok/487/headpytorch/executorch:gh/swolchok/487/headCopy head branch name to clipboard