diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 6709446..20f725b 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -2991,8 +2991,10 @@
 
   // The dalvik jit had a bug where the long operations add, sub, or, xor and and would write
   // the first part of the result long before reading the second part of the input longs.
+  //
+  // The same issue was seen on an Android 23 device running x86.
   public boolean canHaveOverlappingLongRegisterBug() {
-    return canHaveBugPresentUntilExclusive(AndroidApiLevel.L);
+    return canHaveBugPresentUntilInclusive(AndroidApiLevel.M);
   }
 
   // Some dalvik versions found in the wild perform invalid JIT compilation of cmp-long