diff --git a/libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp b/libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
index 23fae959..f0093f43 100644
--- a/libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
+++ b/libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
@@ -20,7 +20,7 @@ cc_fuzz {
         "odk_license_request_fuzz.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/license_request_corpus/*"],
     static_libs: [
@@ -37,7 +37,7 @@ cc_fuzz {
         "odk_renewal_request_fuzz.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/renewal_request_corpus/*"],
     static_libs: [
@@ -54,7 +54,7 @@ cc_fuzz {
         "odk_provisioning_request_fuzz.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/provisioning_request_corpus/*"],
     static_libs: [
@@ -71,7 +71,7 @@ cc_fuzz {
         "odk_license_response_fuzz.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/license_response_corpus/*"],
     static_libs: [
@@ -88,7 +88,7 @@ cc_fuzz {
         "odk_renewal_response_fuzz.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/renewal_response_corpus/*"],
     static_libs: [
@@ -105,7 +105,7 @@ cc_fuzz {
         "odk_provisioning_response_fuzz.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/provisioning_response_corpus/*"],
     static_libs: [
@@ -122,7 +122,7 @@ cc_fuzz {
         "odk_license_response_fuzz_with_mutator.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/license_response_corpus/*"],
     static_libs: [
@@ -139,7 +139,7 @@ cc_fuzz {
         "odk_renewal_response_fuzz_with_mutator.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/renewal_response_corpus/*"],
     static_libs: [
@@ -156,7 +156,7 @@ cc_fuzz {
         "odk_provisioning_response_fuzz_with_mutator.cpp",
     ],
     fuzz_config: {
-      componentid: 425099,
+      componentid: 611718,
     },
     corpus: ["corpus/little_endian_64bit/provisioning_response_corpus/*"],
     static_libs: [