Version 2.10.5

* Cherry-pick 3bef6cf639610ea542d7eb64b37d84289ab2899e to stable
* Cherry-pick df8c80954c316f4d332d85653aa6358188e8a2f0 to stable
diff --git a/tools/VERSION b/tools/VERSION
index 16def66..c9dea19 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 10
-PATCH 4
+PATCH 5
 PRERELEASE 0
 PRERELEASE_PATCH 0