Version 1.25.0-dev.16.4

Cherry-pick 73c93a3a1380e78dc686ff2a6fca5ae482e4a0ee into dev
diff --git a/tools/VERSION b/tools/VERSION
index c9fa253..1648a92 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 25
 PATCH 0
 PRERELEASE 16
-PRERELEASE_PATCH 3
+PRERELEASE_PATCH 4