Merge "keystore2_unsafe_fuzzer: Bug Fix" into main