diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
index a1d93d764b9f..6a46a1b6e9c5 100644
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -57,8 +57,7 @@ public class AppConstants {
         public static final boolean feature23Plus = MIN_SDK_VERSION >= 23 || (MAX_SDK_VERSION >= 23 && Build.VERSION.SDK_INT >= 23);
         public static final boolean feature24Plus = MIN_SDK_VERSION >= 24 || (MAX_SDK_VERSION >= 24 && Build.VERSION.SDK_INT >= 24);
         public static final boolean feature26Plus = MIN_SDK_VERSION >= 26 || (MAX_SDK_VERSION >= 26 && Build.VERSION.SDK_INT >= 26);
-        // Given that Android Q is not yet released it shares API level 28 with Android P
-        public static final boolean feature29Plus = BuildCompat.isAtLeastQ();
+        public static final boolean feature29Plus = MIN_SDK_VERSION >= 29 || (MAX_SDK_VERSION >= 29 && Build.VERSION.SDK_INT >= 29);
 
         /*
          * If our MIN_SDK_VERSION is 14 or higher, we must be an ICS device.