Version 2.0.0-dev.69.4

Revert cherry-pick 9727a4a to dev
Cherry-pick 6bddb6c to dev
Cherry-pick 57e11e3 to dev
Cherry-pick 0998153 to dev
diff --git a/tools/VERSION b/tools/VERSION
index 0ebcd39..7c09085 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,5 +28,4 @@
 MINOR 0
 PATCH 0
 PRERELEASE 69
-PRERELEASE_PATCH 3
-*
\ No newline at end of file
+PRERELEASE_PATCH 4