Version 2.2.1-dev.1.1

* Cherry-pick 567d552de8ff93d704111467e7f3bf3b896ab684 to dev
* Cherry-pick 4ca57befd707a0309e384472a566c084eef0e56e to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e111253..37704bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.2.1-dev.1.1
+
+* Cherry-pick 567d552de8ff93d704111467e7f3bf3b896ab684 to dev
+* Cherry-pick 4ca57befd707a0309e384472a566c084eef0e56e to dev
+
 ## 2.2.1-dev.1.0
 
 ### Tool Changes
diff --git a/tools/VERSION b/tools/VERSION
index 5df95eb..6ba184f 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -34,6 +34,6 @@
 MINOR 2
 PATCH 1
 PRERELEASE 1
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
 ABI_VERSION 0
 OLDEST_SUPPORTED_ABI_VERSION 0