Merge "Revert "DecryptHandle cleanup""