Version 2.8.2

* Cherry-pick 86010dbe98193590f3b583366a5c9d7332b6a423 to stable
* Cherry-pick 33056425aff7c3bfff29410b4490ea2eec6c3e34 to stable
diff --git a/tools/VERSION b/tools/VERSION
index aa5de78..65c2502 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -32,7 +32,7 @@
 CHANNEL stable
 MAJOR 2
 MINOR 8
-PATCH 1
+PATCH 2
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 32