Version 2.9.2

* Cherry-pick 5e551dd926969dc2642cc027fd9215c7365f707b to stable
* Cherry-pick 62093ca8ede6cac91c9724907b31a05bb85cac56 to stable
diff --git a/tools/VERSION b/tools/VERSION
index e82a19b..ddf8dc5 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -32,7 +32,7 @@
 CHANNEL stable
 MAJOR 2
 MINOR 9
-PATCH 1
+PATCH 2
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 38