Merge "Fix soundness issue in keystore2." into main