Version 1.24.0-dev.6.4

Cherry-pick 97b750425db5568aa16f3cf0fd808d933151e2dd to dev
Cherry-pick 93864c0db92d0a4066912507cbf5466b50996cc3 to dev
diff --git a/tools/VERSION b/tools/VERSION
index 617fe7a..a107d71 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 24
 PATCH 0
 PRERELEASE 6
-PRERELEASE_PATCH 3
+PRERELEASE_PATCH 4