Version 2.5.0-dev.2.1

* Cherry-pick 81569e5fe360b9d3229b560b756c477c42058828 to dev
* Cherry-pick 28e857bbf5ba54a10fdab3aeec1917d153495e3d to dev
diff --git a/tools/VERSION b/tools/VERSION
index f100d4d..a5d8aa2 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -34,6 +34,6 @@
 MINOR 5
 PATCH 0
 PRERELEASE 2
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
 ABI_VERSION 11
 OLDEST_SUPPORTED_ABI_VERSION 11