Version 2.2.1-dev.2.1

* Cherry-pick 611a53ee5eb091af491ed8fa74295ee779743a90 to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c60a641..0c8043b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.1-dev.2.1
+
+* Cherry-pick 611a53ee5eb091af491ed8fa74295ee779743a90 to dev
+
 #### dartfmt
 
 * Tweak set literal formatting to follow other collection literals.
diff --git a/tools/VERSION b/tools/VERSION
index 2096130..d646102 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -34,6 +34,6 @@
 MINOR 2
 PATCH 1
 PRERELEASE 2
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
 ABI_VERSION 0
 OLDEST_SUPPORTED_ABI_VERSION 0