Merge "Revert "Fix enrollment cancelation race conditions.""