Version 1.18.0-dev.4.2

Cherry-pick 4bfdaa83b2c5c6f90f410e7eea4729f8f65d3440 into dev
Cherry-pick 7af8d6e5a4f981e06a29e28db180ca4badd2f0f9 into dev
diff --git a/tools/VERSION b/tools/VERSION
index 9a83b13..e275633 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 18
 PATCH 0
 PRERELEASE 4
-PRERELEASE_PATCH 1
+PRERELEASE_PATCH 2