diff --git a/device-oriole.mk b/device-oriole.mk
index d7718b8..990c305 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -210,3 +210,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
     vendor.zram.size=3g
+
+# This device is shipped with 31 (Android S)
+PRODUCT_SHIPPING_API_LEVEL := 31
diff --git a/device-raven.mk b/device-raven.mk
index ebf8c5f..7f2df2b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -226,3 +226,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
     vendor.zram.size=3g
+
+# This device is shipped with 31 (Android S)
+PRODUCT_SHIPPING_API_LEVEL := 31
diff --git a/device-slider.mk b/device-slider.mk
index acacaf7..26ea3a0 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -104,3 +104,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
+
+# This device is shipped with 31 (Android S)
+PRODUCT_SHIPPING_API_LEVEL := 31
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 52e556b..1b1d5c3 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -85,3 +85,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
+
+# This device is shipped with 31 (Android S)
+PRODUCT_SHIPPING_API_LEVEL := 31