diff --git a/src/com/android/settings/panel/VolumePanel.java b/src/com/android/settings/panel/VolumePanel.java
index 4f38504d5e6..16b0cd1c894 100644
--- a/src/com/android/settings/panel/VolumePanel.java
+++ b/src/com/android/settings/panel/VolumePanel.java
@@ -57,7 +57,10 @@ import java.util.concurrent.FutureTask;
 
 /**
  * Panel data class for Volume settings.
+ *
+ * @deprecated this is no longer used after V and will be removed.
  */
+@Deprecated(forRemoval = true)
 public class VolumePanel implements PanelContent, LifecycleObserver {
     private static final String TAG = "VolumePanel";
 
diff --git a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
index d30ef3eb3e9..91b3a4a9aad 100644
--- a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
+++ b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java
@@ -35,6 +35,7 @@ import org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
 
+@Deprecated(forRemoval = true)
 @RunWith(RobolectricTestRunner.class)
 public class VolumePanelTest {