diff --git a/misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestJavaSnippets.java b/misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestJavaSnippets.java
index ac4c0c28f..ba249b0e6 100644
--- a/misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestJavaSnippets.java
+++ b/misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestJavaSnippets.java
@@ -16,6 +16,7 @@
 
 package com.example.snippets;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import org.junit.Rule;
@@ -33,16 +34,18 @@ public void activity_launched_notLetterBoxed() {
         try (ActivityScenario<MainActivity> scenario =
             ActivityScenario.launch(MainActivity.class)) {
                 scenario.onActivity( activity -> {
-                    assertFalse(isLetterboxed(activity));
+                    assertFalse(activity.isLetterboxed());
                 });
             }
     }
     // [END android_device_compatibility_mode_assert_isLetterboxed_java]
 
 
-    // Method used by snippets.
-    public boolean isLetterboxed(MainActivity activity) {
-        return true;
-    }
+    // Class used by snippets.
 
+    class MainActivity extends AppCompatActivity {
+        public boolean isLetterboxed() {
+            return true;
+        }
+    }
 }
diff --git a/misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestKotlinSnippets.kt b/misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestKotlinSnippets.kt
index 7b392c612..65f9a7f1f 100644
--- a/misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestKotlinSnippets.kt
+++ b/misc/src/androidTest/java/com/example/snippets/DeviceCompatibilityModeTestKotlinSnippets.kt
@@ -36,10 +36,9 @@ class DeviceCompatibilityModeTestKotlinSnippets {
     }
     // [END android_device_compatibility_mode_assert_isLetterboxed_kotlin]
 
-    // Classes used by snippets.
+    // Class used by snippets.
 
     class MainActivity : AppCompatActivity() {
-
         fun isLetterboxed(): Boolean {
             return true
         }