diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
index 44158c7..7d9c4b2 100644
--- a/tests/componenttests/Android.bp
+++ b/tests/componenttests/Android.bp
@@ -27,6 +27,8 @@
     ],
 
     test_suites: ["device-tests"],
-
+    optimize: {
+        enabled: false,
+    },
     instrumentation_for: "Settings",
 }
diff --git a/tests/componenttests/src/com/android/settings/notification/AppNotificationComponentTest.java b/tests/componenttests/src/com/android/settings/notification/AppNotificationComponentTest.java
index e08a8ac..0607558 100644
--- a/tests/componenttests/src/com/android/settings/notification/AppNotificationComponentTest.java
+++ b/tests/componenttests/src/com/android/settings/notification/AppNotificationComponentTest.java
@@ -21,6 +21,7 @@
 import android.app.Instrumentation;
 import android.content.Intent;
 import android.provider.Settings;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -63,6 +64,14 @@
                 activity -> {
                     View rv = activity.findViewById(R.id.recycler_view);
 
+                    if (rv == null) {
+                        Log.d("UI_UTILS",
+                                "Target not found: R.id.recycler_view #" + Integer.toHexString(
+                                        R.id.recycler_view));
+                        UiUtils.dumpView(UiUtils.getFirstViewFromActivity(activity));
+                        assertThat(Boolean.TRUE).isFalse();
+                    }
+
                     UiUtils.waitUntilCondition(5000,
                             () -> rv.findViewById(R.id.main_switch_bar) != null);