diff --git a/device-oriole.mk b/device-oriole.mk
index 8d66e4a..ee924d4 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -218,3 +218,6 @@
 # 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 6d1f207..c135a34 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -235,3 +235,6 @@
 # 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 47f85ea..acfcf4c 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -109,3 +109,6 @@
 # Bluetooth HAL
 PRODUCT_PACKAGES += \
 	bt_vendor.conf
+
+# This device is shipped with 31 (Android S)
+PRODUCT_SHIPPING_API_LEVEL := 31
diff --git a/device-whitefin.mk b/device-whitefin.mk
index e708376..83ad5cd 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -90,3 +90,6 @@
 # Bluetooth HAL
 PRODUCT_PACKAGES += \
 	bt_vendor.conf
+
+# This device is shipped with 31 (Android S)
+PRODUCT_SHIPPING_API_LEVEL := 31