diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
index 92e8b3ad0db..126bb7a8a02 100644
--- a/.ci/flutter_master.version
+++ b/.ci/flutter_master.version
@@ -1 +1 @@
-29a6c648ca4d2b813a6787644fdfe20421a2570a
+4b23b8182888d5d94645d8f97cdcc79800e44a9a
diff --git a/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java b/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java
index 69f9a910c75..6fd43c2f9a3 100644
--- a/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java
+++ b/packages/camera/camera_android_camerax/android/src/test/java/io/flutter/plugins/camerax/PreviewTest.java
@@ -128,7 +128,7 @@ public void createSurfaceProducer_setsExpectedSurfaceProducerCallback() {
     TextureRegistry.SurfaceProducer.Callback callback = callbackCaptor.getValue();
 
     // Verify callback's onSurfaceDestroyed invalidates SurfaceRequest.
-    callback.onSurfaceDestroyed();
+    simulateSurfaceDestruction(callback);
     verify(mockSurfaceRequest).invalidate();
 
     reset(mockSurfaceRequest);
@@ -262,4 +262,12 @@ public void setTargetRotation_makesCallToSetTargetRotation() {
 
     verify(mockPreview).setTargetRotation(targetRotation);
   }
+
+  // TODO(bparrishMines): Replace with inline calls to onSurfaceCleanup once available on stable;
+  // see https://github.com/flutter/flutter/issues/16125. This separate method only exists to scope
+  // the suppression.
+  @SuppressWarnings({"deprecation", "removal"})
+  void simulateSurfaceDestruction(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
+    producerLifecycle.onSurfaceDestroyed();
+  }
 }
diff --git a/packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java b/packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java
index 509d7946c2d..99a29aaacb3 100644
--- a/packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java
+++ b/packages/video_player/video_player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java
@@ -184,7 +184,7 @@ public void onSurfaceProducerDestroyedAndAvailableReleasesAndThenRecreatesAndRes
     when(mockExoPlayer.getPlaybackParameters()).thenReturn(new PlaybackParameters(2.5f));
 
     TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
-    producerLifecycle.onSurfaceDestroyed();
+    simulateSurfaceDestruction(producerLifecycle);
 
     verify(mockExoPlayer).release();
 
@@ -206,7 +206,7 @@ public void onSurfaceProducerDestroyedDoesNotStopOrPauseVideo() {
 
     verify(mockProducer).setCallback(callbackCaptor.capture());
     TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
-    producerLifecycle.onSurfaceDestroyed();
+    simulateSurfaceDestruction(producerLifecycle);
 
     verify(mockExoPlayer, never()).stop();
     verify(mockExoPlayer, never()).pause();
@@ -256,7 +256,7 @@ public void onSurfaceAvailableDoesNotSendInitializeEventAgain() {
     TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();
 
     // Trigger destroyed/available.
-    producerLifecycle.onSurfaceDestroyed();
+    simulateSurfaceDestruction(producerLifecycle);
     producerLifecycle.onSurfaceAvailable();
 
     // Initial listener, and the new one from the resume.
@@ -301,4 +301,12 @@ public void disposeReleasesExoPlayerBeforeTexture() {
     inOrder.verify(mockExoPlayer).release();
     inOrder.verify(mockProducer).release();
   }
+
+  // TODO(bparrishMines): Replace with inline calls to onSurfaceCleanup once available on stable;
+  // see https://github.com/flutter/flutter/issues/16125. This separate method only exists to scope
+  // the suppression.
+  @SuppressWarnings({"deprecation", "removal"})
+  void simulateSurfaceDestruction(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
+    producerLifecycle.onSurfaceDestroyed();
+  }
 }