Merge "Revert "Fix Rsa-Oaep operation begin on T+GSI build"" into main