diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp
index 606a5185..61f19dcf 100644
--- a/libwvdrmengine/Android.bp
+++ b/libwvdrmengine/Android.bp
@@ -94,6 +94,7 @@ cc_defaults {
     name: "common_widevine_service-multilib-defaults-aidl",
     owner: "widevine",
     proprietary: true,
+    min_sdk_version: "UpsideDownCake",
     relative_install_path: "hw",
     include_dirs: [
         "vendor/widevine/libwvdrmengine/cdm/core/include/",
@@ -224,6 +225,7 @@ cc_library_static {
         "libcrypto",
         "liblog",
     ],
+    min_sdk_version: "UpsideDownCake",
 }
 
 // ----------------------------------------------------------------------------
@@ -285,6 +287,7 @@ cc_library {
     owner: "widevine",
 
     proprietary: true,
+    min_sdk_version: "UpsideDownCake",
 }
 
 phony {
diff --git a/libwvdrmengine/apex/Android.bp b/libwvdrmengine/apex/Android.bp
index fda4f0c6..e26cd0d3 100644
--- a/libwvdrmengine/apex/Android.bp
+++ b/libwvdrmengine/apex/Android.bp
@@ -41,12 +41,13 @@ widevine_apex_defaults {
     prebuilts: [
         "com.google.android.widevine.xml",  // etc/vintf
     ],
+    // TODO(b/274041915) remove updatable:false
     updatable: false,
     // TODO(b/268439003) We need an API to get apex version. Until then
     // we'll read apex_manifest.pb to get the version. To label apex_manifest.pb
     // as vendor_configs_file (which the apex can access), turn off force-label.
     use_file_contexts_as_is: true,
-    use_vndk_as_stable: true,
+    min_sdk_version: "UpsideDownCake",
     vendor: true,
 }
 
diff --git a/libwvdrmengine/apex/proto/Android.bp b/libwvdrmengine/apex/proto/Android.bp
index 39bb0473..25184d1c 100644
--- a/libwvdrmengine/apex/proto/Android.bp
+++ b/libwvdrmengine/apex/proto/Android.bp
@@ -39,4 +39,5 @@ cc_library_static {
         "libbase",
     ],
     vendor: true,
+    min_sdk_version: "UpsideDownCake",
 }
diff --git a/libwvdrmengine/cdm/Android.bp b/libwvdrmengine/cdm/Android.bp
index 6b9bc9f7..348ed9ff 100644
--- a/libwvdrmengine/cdm/Android.bp
+++ b/libwvdrmengine/cdm/Android.bp
@@ -80,5 +80,5 @@ cc_library_static {
     ],
 
     proprietary: true,
-
+    min_sdk_version: "UpsideDownCake",
 }
diff --git a/libwvdrmengine/cdm/core/src/Android.bp b/libwvdrmengine/cdm/core/src/Android.bp
index ad61c5c3..77c84584 100644
--- a/libwvdrmengine/cdm/core/src/Android.bp
+++ b/libwvdrmengine/cdm/core/src/Android.bp
@@ -35,4 +35,5 @@ cc_library {
     static_libs: ["libcdm_metrics_protos"],
     whole_static_libs: ["libcdm_metrics_protos"],
     export_static_lib_headers: ["libcdm_metrics_protos"],
+    min_sdk_version: "UpsideDownCake",
 }
diff --git a/libwvdrmengine/cdm/metrics/src/Android.bp b/libwvdrmengine/cdm/metrics/src/Android.bp
index 68dc9511..83f3dcd0 100644
--- a/libwvdrmengine/cdm/metrics/src/Android.bp
+++ b/libwvdrmengine/cdm/metrics/src/Android.bp
@@ -66,4 +66,6 @@ cc_library {
         export_proto_headers: true,
         type: "full",
     },
+
+    min_sdk_version: "UpsideDownCake",
 }
diff --git a/libwvdrmengine/level3/Android.bp b/libwvdrmengine/level3/Android.bp
index 8d4875fc..93ee2144 100644
--- a/libwvdrmengine/level3/Android.bp
+++ b/libwvdrmengine/level3/Android.bp
@@ -75,5 +75,5 @@ cc_library_static {
     proprietary: true,
 
     owner: "widevine",
-
+    min_sdk_version: "UpsideDownCake",
 }
diff --git a/libwvdrmengine/mediacrypto/Android.bp b/libwvdrmengine/mediacrypto/Android.bp
index 61171bb3..a685071d 100644
--- a/libwvdrmengine/mediacrypto/Android.bp
+++ b/libwvdrmengine/mediacrypto/Android.bp
@@ -64,4 +64,5 @@ cc_library_static {
     cflags: ["-Wthread-safety"],
 
     proprietary: true,
+    min_sdk_version: "UpsideDownCake",
 }
diff --git a/libwvdrmengine/mediadrm/Android.bp b/libwvdrmengine/mediadrm/Android.bp
index 0f7628ae..0a53618e 100644
--- a/libwvdrmengine/mediadrm/Android.bp
+++ b/libwvdrmengine/mediadrm/Android.bp
@@ -63,4 +63,5 @@ cc_library_static {
     ],
 
     proprietary: true,
+    min_sdk_version: "UpsideDownCake",
 }
diff --git a/libwvdrmengine/oemcrypto/odk/Android.bp b/libwvdrmengine/oemcrypto/odk/Android.bp
index 92646bc8..544c838f 100644
--- a/libwvdrmengine/oemcrypto/odk/Android.bp
+++ b/libwvdrmengine/oemcrypto/odk/Android.bp
@@ -38,6 +38,7 @@ cc_library_static {
     proprietary: true,
 
     owner: "widevine",
+    min_sdk_version: "UpsideDownCake",
 }
 
 // ----------------------------------------------------------------