diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/AudioAttributesCompatTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/AudioAttributesCompatTest.java
index 0dc2fcbb21..4d01628dd8 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/AudioAttributesCompatTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/legacy/AudioAttributesCompatTest.java
@@ -45,16 +45,18 @@ public class AudioAttributesCompatTest {
 
   // some objects we'll toss around
   Object mMediaAA;
-  AudioAttributesCompat mMediaAAC,
-      mMediaLegacyAAC,
-      mMediaAACFromAA,
-      mNotificationAAC,
-      mNotificationLegacyAAC;
+  AudioAttributesCompat mMediaAAC;
+  AudioAttributesCompat mMediaLegacyAAC;
+  AudioAttributesCompat mMediaAACFromAA;
+  AudioAttributesCompat mNotificationAAC;
+  AudioAttributesCompat mNotificationLegacyAAC;
 
   @Before
   @SdkSuppress(minSdkVersion = 21)
   public void setUpApi21() {
-    if (Build.VERSION.SDK_INT < 21) return;
+    if (Build.VERSION.SDK_INT < 21) {
+      return;
+    }
     mMediaAA =
         new AudioAttributes.Builder()
             .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)