diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index 91b231b..b945b2a 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -2084,6 +2084,9 @@
 }
 
 TEST_F(Dex2oatTest, AppImageResolveStrings) {
+  if (!ClassLinker::kAppImageMayContainStrings) {
+    TEST_DISABLED();
+  }
   using Hotness = ProfileCompilationInfo::MethodHotness;
   // Create a profile with the startup method marked.
   ScratchFile profile_file;
diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 996427e..b6f1f86 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -111,7 +111,9 @@
 
 class ClassLinker {
  public:
-  static constexpr bool kAppImageMayContainStrings = true;
+  // Disabled until AppImageLoadingHelper::UpdateInternStrings does the missing GC card marks.
+  // Bug: 117846779
+  static constexpr bool kAppImageMayContainStrings = false;
 
   explicit ClassLinker(InternTable* intern_table);
   virtual ~ClassLinker();
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index a5157df..1460562 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -191,6 +191,12 @@
   DISALLOW_COPY_AND_ASSIGN(CheckJniAbortCatcher);
 };
 
+#define TEST_DISABLED() \
+  if ((true)) { \
+    printf("WARNING: TEST DISABLED\n"); \
+    return; \
+  }
+
 #define TEST_DISABLED_FOR_ARM() \
   if (kRuntimeISA == InstructionSet::kArm || kRuntimeISA == InstructionSet::kThumb2) { \
     printf("WARNING: TEST DISABLED FOR ARM\n"); \