Version 1.22.0-dev.10.4

Cherry-pick 955a45b06ed7c512142ec4979f24ffd64b5eaa0b into dev
Cherry-pick 167107e94c7b02272f1e316d4d06c9c66b9a6bbe into dev
diff --git a/tools/VERSION b/tools/VERSION
index e45ee0b..130540a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 22
 PATCH 0
 PRERELEASE 10
-PRERELEASE_PATCH 3
+PRERELEASE_PATCH 4