diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index a2153cd..bdb9be7 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1005166"
+    build_id: "T1005628"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/sdk/conscrypt-module-sdk-current.zip"
   }
diff --git a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
index a0a0e50..08a8649 100644
--- a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1005166"
+    build_id: "T1005628"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/host-exports/conscrypt-module-host-exports-current.zip"
   }
diff --git a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
index b5d1717..4bb3b18 100644
--- a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1005166"
+    build_id: "T1005628"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/test-exports/conscrypt-module-test-exports-current.zip"
   }
diff --git a/current/Android.bp b/current/Android.bp
index 5fe484d..af0af1f 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -85,27 +85,27 @@
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
     shared_library: false,
     public: {
-        jars: ["sdk_library/public/conscrypt.module.public.api-stubs.jar"],
-        stub_srcs: ["sdk_library/public/conscrypt.module.public.api.srcjar"],
-        current_api: "sdk_library/public/conscrypt.module.public.api.txt",
-        removed_api: "sdk_library/public/conscrypt.module.public.api-removed.txt",
-        annotations: "sdk_library/public/conscrypt.module.public.api_annotations.zip",
+        jars: ["sdk_library/public/conscrypt-stubs.jar"],
+        stub_srcs: ["sdk_library/public/conscrypt.srcjar"],
+        current_api: "sdk_library/public/conscrypt.txt",
+        removed_api: "sdk_library/public/conscrypt-removed.txt",
+        annotations: "sdk_library/public/conscrypt_annotations.zip",
         sdk_version: "none",
     },
     system: {
-        jars: ["sdk_library/system/conscrypt.module.public.api-stubs.jar"],
-        stub_srcs: ["sdk_library/system/conscrypt.module.public.api.srcjar"],
-        current_api: "sdk_library/system/conscrypt.module.public.api.txt",
-        removed_api: "sdk_library/system/conscrypt.module.public.api-removed.txt",
-        annotations: "sdk_library/system/conscrypt.module.public.api_annotations.zip",
+        jars: ["sdk_library/system/conscrypt-stubs.jar"],
+        stub_srcs: ["sdk_library/system/conscrypt.srcjar"],
+        current_api: "sdk_library/system/conscrypt.txt",
+        removed_api: "sdk_library/system/conscrypt-removed.txt",
+        annotations: "sdk_library/system/conscrypt_annotations.zip",
         sdk_version: "none",
     },
     module_lib: {
-        jars: ["sdk_library/module-lib/conscrypt.module.public.api-stubs.jar"],
-        stub_srcs: ["sdk_library/module-lib/conscrypt.module.public.api.srcjar"],
-        current_api: "sdk_library/module-lib/conscrypt.module.public.api.txt",
-        removed_api: "sdk_library/module-lib/conscrypt.module.public.api-removed.txt",
-        annotations: "sdk_library/module-lib/conscrypt.module.public.api_annotations.zip",
+        jars: ["sdk_library/module-lib/conscrypt-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/conscrypt.srcjar"],
+        current_api: "sdk_library/module-lib/conscrypt.txt",
+        removed_api: "sdk_library/module-lib/conscrypt-removed.txt",
+        annotations: "sdk_library/module-lib/conscrypt_annotations.zip",
         sdk_version: "none",
     },
 }
@@ -128,10 +128,10 @@
     licenses: ["conscrypt-module-sdk_external_conscrypt_license"],
     shared_library: false,
     public: {
-        jars: ["sdk_library/public/conscrypt.module.platform.api-stubs.jar"],
-        stub_srcs: ["sdk_library/public/conscrypt.module.platform.api.srcjar"],
-        current_api: "sdk_library/public/conscrypt.module.platform.api.txt",
-        removed_api: "sdk_library/public/conscrypt.module.platform.api-removed.txt",
+        jars: ["sdk_library/public/conscrypt-coreplatform-stubs.jar"],
+        stub_srcs: ["sdk_library/public/conscrypt-coreplatform.srcjar"],
+        current_api: "sdk_library/public/conscrypt-coreplatform.txt",
+        removed_api: "sdk_library/public/conscrypt-coreplatform-removed.txt",
         sdk_version: "none",
     },
 }
diff --git a/current/arm/lib/libconscrypt_jni.so b/current/arm/lib/libconscrypt_jni.so
index 732edf5..7806f33 100755
--- a/current/arm/lib/libconscrypt_jni.so
+++ b/current/arm/lib/libconscrypt_jni.so
Binary files differ
diff --git a/current/arm64/lib/libconscrypt_jni.so b/current/arm64/lib/libconscrypt_jni.so
index d3ae331..1f9a7b3 100755
--- a/current/arm64/lib/libconscrypt_jni.so
+++ b/current/arm64/lib/libconscrypt_jni.so
Binary files differ
diff --git a/current/host-exports/Android.bp b/current/host-exports/Android.bp
index 26a3cad..548ed14 100644
--- a/current/host-exports/Android.bp
+++ b/current/host-exports/Android.bp
@@ -16,6 +16,7 @@
     visibility: [
         "//build/make/tools/signapk",
         "//external/conscrypt",
+        "//external/robolectric/robolectric",
         "//external/robolectric:__subpackages__",
         "//tools/apksig",
     ],
diff --git a/current/host-exports/java/linux_bionic/conscrypt-unbundled.jar b/current/host-exports/java/linux_bionic/conscrypt-unbundled.jar
index 8a5aaf6..ee462cb 100644
--- a/current/host-exports/java/linux_bionic/conscrypt-unbundled.jar
+++ b/current/host-exports/java/linux_bionic/conscrypt-unbundled.jar
Binary files differ
diff --git a/current/host-exports/java/linux_glibc/conscrypt-unbundled.jar b/current/host-exports/java/linux_glibc/conscrypt-unbundled.jar
index 8a5aaf6..ee462cb 100644
--- a/current/host-exports/java/linux_glibc/conscrypt-unbundled.jar
+++ b/current/host-exports/java/linux_glibc/conscrypt-unbundled.jar
Binary files differ
diff --git a/current/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so b/current/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so
index 1b47562..50d3ad9 100755
--- a/current/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so
+++ b/current/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so
Binary files differ
diff --git a/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so b/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so
index 4e28ff9..976bb17 100755
--- a/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so
+++ b/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so
Binary files differ
diff --git a/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so b/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so
index 02d9eb4..415f5ac 100755
--- a/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so
+++ b/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so
Binary files differ
diff --git a/current/host-exports/snapshot-creation-build-number.txt b/current/host-exports/snapshot-creation-build-number.txt
index 6a0c947..a446902 100644
--- a/current/host-exports/snapshot-creation-build-number.txt
+++ b/current/host-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9279850
\ No newline at end of file
+9424435
\ No newline at end of file
diff --git a/current/sdk_library/module-lib/conscrypt-removed.txt b/current/sdk_library/module-lib/conscrypt-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/current/sdk_library/module-lib/conscrypt-stubs.jar b/current/sdk_library/module-lib/conscrypt-stubs.jar
new file mode 100644
index 0000000..fbb279e
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/conscrypt.srcjar b/current/sdk_library/module-lib/conscrypt.srcjar
new file mode 100644
index 0000000..df1a3d0
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt.srcjar
Binary files differ
diff --git a/current/sdk_library/module-lib/conscrypt.txt b/current/sdk_library/module-lib/conscrypt.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/current/sdk_library/module-lib/conscrypt_annotations.zip b/current/sdk_library/module-lib/conscrypt_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/module-lib/conscrypt_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/conscrypt-coreplatform-removed.txt b/current/sdk_library/public/conscrypt-coreplatform-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/public/conscrypt-coreplatform-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/current/sdk_library/public/conscrypt-coreplatform-stubs.jar b/current/sdk_library/public/conscrypt-coreplatform-stubs.jar
new file mode 100644
index 0000000..5c9645a
--- /dev/null
+++ b/current/sdk_library/public/conscrypt-coreplatform-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt-coreplatform.srcjar b/current/sdk_library/public/conscrypt-coreplatform.srcjar
new file mode 100644
index 0000000..e115efd
--- /dev/null
+++ b/current/sdk_library/public/conscrypt-coreplatform.srcjar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt-coreplatform.txt b/current/sdk_library/public/conscrypt-coreplatform.txt
new file mode 100644
index 0000000..b645383
--- /dev/null
+++ b/current/sdk_library/public/conscrypt-coreplatform.txt
@@ -0,0 +1,100 @@
+// Signature format: 2.0
+package com.android.org.conscrypt {
+
+  public interface CertPinManager {
+  }
+
+  public final class ClientSessionContext implements javax.net.ssl.SSLSessionContext {
+    method public final java.util.Enumeration<byte[]> getIds();
+    method public final javax.net.ssl.SSLSession getSession(byte[]);
+    method public final int getSessionCacheSize();
+    method public final int getSessionTimeout();
+    method public void setPersistentCache(com.android.org.conscrypt.SSLClientSessionCache);
+    method public final void setSessionCacheSize(int) throws java.lang.IllegalArgumentException;
+    method public final void setSessionTimeout(int) throws java.lang.IllegalArgumentException;
+  }
+
+  public final class Conscrypt {
+    method public static javax.net.ssl.X509TrustManager getDefaultX509TrustManager() throws java.security.KeyManagementException;
+  }
+
+  public interface ConscryptCertStore {
+  }
+
+  public final class FileClientSessionCache {
+    method public static com.android.org.conscrypt.SSLClientSessionCache usingDirectory(java.io.File) throws java.io.IOException;
+  }
+
+  public final class OpenSSLProvider extends java.security.Provider {
+    ctor public OpenSSLProvider();
+  }
+
+  public abstract class OpenSSLSocketImpl extends javax.net.ssl.SSLSocket {
+    method public void addHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener);
+    method public final void connect(java.net.SocketAddress) throws java.io.IOException;
+    method public final void connect(java.net.SocketAddress, int) throws java.io.IOException;
+    method @Deprecated public final byte[] getAlpnSelectedProtocol();
+    method @Deprecated public final byte[] getNpnSelectedProtocol();
+    method public final int getPort();
+    method public final int getSoTimeout() throws java.net.SocketException;
+    method public void removeHandshakeCompletedListener(javax.net.ssl.HandshakeCompletedListener);
+    method public final void sendUrgentData(int) throws java.io.IOException;
+    method @Deprecated public final void setAlpnProtocols(byte[]);
+    method public abstract void setChannelIdPrivateKey(java.security.PrivateKey);
+    method public void setHandshakeTimeout(int) throws java.net.SocketException;
+    method public void setHostname(String);
+    method @Deprecated public final void setNpnProtocols(byte[]);
+    method public final void setOOBInline(boolean) throws java.net.SocketException;
+    method public final void setSoTimeout(int) throws java.net.SocketException;
+    method public void setSoWriteTimeout(int) throws java.net.SocketException;
+    method public abstract void setUseSessionTickets(boolean);
+  }
+
+  public interface SSLClientSessionCache {
+  }
+
+  public final class TrustManagerImpl extends javax.net.ssl.X509ExtendedTrustManager {
+    ctor public TrustManagerImpl(java.security.KeyStore);
+    ctor public TrustManagerImpl(java.security.KeyStore, com.android.org.conscrypt.CertPinManager, com.android.org.conscrypt.ConscryptCertStore);
+    method public void checkClientTrusted(java.security.cert.X509Certificate[], String) throws java.security.cert.CertificateException;
+    method public void checkClientTrusted(java.security.cert.X509Certificate[], String, java.net.Socket) throws java.security.cert.CertificateException;
+    method public void checkClientTrusted(java.security.cert.X509Certificate[], String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException;
+    method public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(java.security.cert.X509Certificate[], String, String) throws java.security.cert.CertificateException;
+    method public java.util.List<java.security.cert.X509Certificate> getTrustedChainForServer(java.security.cert.X509Certificate[], String, java.net.Socket) throws java.security.cert.CertificateException;
+    method public java.util.List<java.security.cert.X509Certificate> getTrustedChainForServer(java.security.cert.X509Certificate[], String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException;
+    method public void handleTrustStorageUpdate();
+  }
+
+  public final class TrustedCertificateIndex {
+    ctor public TrustedCertificateIndex();
+    method public java.util.Set<java.security.cert.TrustAnchor> findAllByIssuerAndSignature(java.security.cert.X509Certificate);
+    method public java.security.cert.TrustAnchor findByIssuerAndSignature(java.security.cert.X509Certificate);
+    method public java.security.cert.TrustAnchor findBySubjectAndPublicKey(java.security.cert.X509Certificate);
+    method public java.security.cert.TrustAnchor index(java.security.cert.X509Certificate);
+  }
+
+  public class TrustedCertificateStore implements com.android.org.conscrypt.ConscryptCertStore {
+    ctor public TrustedCertificateStore();
+    method public java.util.Set<java.lang.String> aliases();
+    method public java.util.Set<java.lang.String> allSystemAliases();
+    method public boolean containsAlias(String);
+    method public void deleteCertificateEntry(String) throws java.security.cert.CertificateException, java.io.IOException;
+    method public java.util.Set<java.security.cert.X509Certificate> findAllIssuers(java.security.cert.X509Certificate);
+    method public java.security.cert.X509Certificate findIssuer(java.security.cert.X509Certificate);
+    method public java.security.cert.Certificate getCertificate(String);
+    method public java.security.cert.Certificate getCertificate(String, boolean);
+    method public String getCertificateAlias(java.security.cert.Certificate);
+    method public String getCertificateAlias(java.security.cert.Certificate, boolean);
+    method public java.util.List<java.security.cert.X509Certificate> getCertificateChain(java.security.cert.X509Certificate) throws java.security.cert.CertificateException;
+    method public java.io.File getCertificateFile(java.io.File, java.security.cert.X509Certificate);
+    method public java.util.Date getCreationDate(String);
+    method public java.security.cert.X509Certificate getTrustAnchor(java.security.cert.X509Certificate);
+    method public void installCertificate(java.security.cert.X509Certificate) throws java.security.cert.CertificateException, java.io.IOException;
+    method public static final boolean isUser(String);
+    method public boolean isUserAddedCertificate(java.security.cert.X509Certificate);
+    method public static void setDefaultUserDirectory(java.io.File);
+    method public java.util.Set<java.lang.String> userAliases();
+  }
+
+}
+
diff --git a/current/sdk_library/public/conscrypt-removed.txt b/current/sdk_library/public/conscrypt-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/public/conscrypt-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/current/sdk_library/public/conscrypt-stubs.jar b/current/sdk_library/public/conscrypt-stubs.jar
new file mode 100644
index 0000000..e0e7117
--- /dev/null
+++ b/current/sdk_library/public/conscrypt-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.srcjar b/current/sdk_library/public/conscrypt.srcjar
new file mode 100644
index 0000000..e7ef027
--- /dev/null
+++ b/current/sdk_library/public/conscrypt.srcjar
Binary files differ
diff --git a/current/sdk_library/public/conscrypt.txt b/current/sdk_library/public/conscrypt.txt
new file mode 100644
index 0000000..809495c
--- /dev/null
+++ b/current/sdk_library/public/conscrypt.txt
@@ -0,0 +1,17 @@
+// Signature format: 2.0
+package android.net.ssl {
+
+  public class SSLEngines {
+    method @Nullable public static byte[] exportKeyingMaterial(@NonNull javax.net.ssl.SSLEngine, @NonNull String, @Nullable byte[], int) throws javax.net.ssl.SSLException;
+    method public static boolean isSupportedEngine(@NonNull javax.net.ssl.SSLEngine);
+    method public static void setUseSessionTickets(@NonNull javax.net.ssl.SSLEngine, boolean);
+  }
+
+  public class SSLSockets {
+    method @Nullable public static byte[] exportKeyingMaterial(@NonNull javax.net.ssl.SSLSocket, @NonNull String, @Nullable byte[], int) throws javax.net.ssl.SSLException;
+    method public static boolean isSupportedSocket(@NonNull javax.net.ssl.SSLSocket);
+    method public static void setUseSessionTickets(@NonNull javax.net.ssl.SSLSocket, boolean);
+  }
+
+}
+
diff --git a/current/sdk_library/public/conscrypt_annotations.zip b/current/sdk_library/public/conscrypt_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/conscrypt_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/conscrypt-removed.txt b/current/sdk_library/system/conscrypt-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/system/conscrypt-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/current/sdk_library/system/conscrypt-stubs.jar b/current/sdk_library/system/conscrypt-stubs.jar
new file mode 100644
index 0000000..fbb279e
--- /dev/null
+++ b/current/sdk_library/system/conscrypt-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/conscrypt.srcjar b/current/sdk_library/system/conscrypt.srcjar
new file mode 100644
index 0000000..df1a3d0
--- /dev/null
+++ b/current/sdk_library/system/conscrypt.srcjar
Binary files differ
diff --git a/current/sdk_library/system/conscrypt.txt b/current/sdk_library/system/conscrypt.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/current/sdk_library/system/conscrypt.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/current/sdk_library/system/conscrypt_annotations.zip b/current/sdk_library/system/conscrypt_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/system/conscrypt_annotations.zip
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 6a0c947..a446902 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9279850
\ No newline at end of file
+9424435
\ No newline at end of file
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index f583e98..7bc55f2 100644
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -16,8 +16,8 @@
     visibility: [
         "//art/build",
         "//external/conscrypt",
+        "//external/robolectric",
         "//external/robolectric-shadows",
-        "//external/robolectric:__subpackages__",
         "//frameworks/layoutlib",
     ],
     apex_available: ["//apex_available:platform"],
diff --git a/current/test-exports/android/arm/lib/libjavacrypto.so b/current/test-exports/android/arm/lib/libjavacrypto.so
index 7bc9785..68ef205 100755
--- a/current/test-exports/android/arm/lib/libjavacrypto.so
+++ b/current/test-exports/android/arm/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/android/arm64/lib/libjavacrypto.so b/current/test-exports/android/arm64/lib/libjavacrypto.so
index 156093a..2b8c4d5 100755
--- a/current/test-exports/android/arm64/lib/libjavacrypto.so
+++ b/current/test-exports/android/arm64/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/android/x86/lib/libjavacrypto.so b/current/test-exports/android/x86/lib/libjavacrypto.so
index 17a2c5e..7af03c5 100755
--- a/current/test-exports/android/x86/lib/libjavacrypto.so
+++ b/current/test-exports/android/x86/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/android/x86_64/lib/libjavacrypto.so b/current/test-exports/android/x86_64/lib/libjavacrypto.so
index efc10ea..1e56c86 100755
--- a/current/test-exports/android/x86_64/lib/libjavacrypto.so
+++ b/current/test-exports/android/x86_64/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/java/conscrypt-for-host.jar b/current/test-exports/java/conscrypt-for-host.jar
index d2b91ec..0ad0ea9 100644
--- a/current/test-exports/java/conscrypt-for-host.jar
+++ b/current/test-exports/java/conscrypt-for-host.jar
Binary files differ
diff --git a/current/test-exports/java/conscrypt-tests.jar b/current/test-exports/java/conscrypt-tests.jar
index 976a448..134643b 100644
--- a/current/test-exports/java/conscrypt-tests.jar
+++ b/current/test-exports/java/conscrypt-tests.jar
Binary files differ
diff --git a/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so b/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so
index 7235c25..90304e0 100755
--- a/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so
+++ b/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so
Binary files differ
diff --git a/current/test-exports/snapshot-creation-build-number.txt b/current/test-exports/snapshot-creation-build-number.txt
index 6a0c947..a446902 100644
--- a/current/test-exports/snapshot-creation-build-number.txt
+++ b/current/test-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9279850
\ No newline at end of file
+9424435
\ No newline at end of file
diff --git a/current/x86/lib/libconscrypt_jni.so b/current/x86/lib/libconscrypt_jni.so
index 420773b..9832205 100755
--- a/current/x86/lib/libconscrypt_jni.so
+++ b/current/x86/lib/libconscrypt_jni.so
Binary files differ
diff --git a/current/x86_64/lib/libconscrypt_jni.so b/current/x86_64/lib/libconscrypt_jni.so
index 351241d..3bfd44d 100755
--- a/current/x86_64/lib/libconscrypt_jni.so
+++ b/current/x86_64/lib/libconscrypt_jni.so
Binary files differ