Version 1.23.0-dev.11.7

Cherry-pick 1a8ef13fd11316547c97d5d537c675e3c5ed87d9 to dev
Cherry-pick 1910147425fe5ffcc840ba60830e88756454c5d5 to dev
diff --git a/tools/VERSION b/tools/VERSION
index 17689a2..e09399d 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 23
 PATCH 0
 PRERELEASE 11
-PRERELEASE_PATCH 6
+PRERELEASE_PATCH 7