Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev