Version 2.10.2

* Cherry-pick 59fe3d510d85b2fb0d2a8424c395f43b9701e657 to stable
* Cherry-pick b84cdd54dea7a3e1e4699fe12cdf9148017b7b52 to stable
diff --git a/tools/VERSION b/tools/VERSION
index d445c09..eb7dda6 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 10
-PATCH 1
+PATCH 2
 PRERELEASE 0
 PRERELEASE_PATCH 0