Version 2.2.1-dev.3.1

* Cherry-pick 245576a096a2da54ef21d664d37d1f50f6f8dbb7 to dev
* Cherry-pick a47b4ad2b8683cc8a82aa0ff89da2db7a3be27a3 to dev
* Cherry-pick 9a2b222cba94126591b5d985a42d40c704a73c90 to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ad463c..f3ef64c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## 2.2.1-dev.3.1
 
+* Cherry-pick 245576a096a2da54ef21d664d37d1f50f6f8dbb7 to dev
+* Cherry-pick a47b4ad2b8683cc8a82aa0ff89da2db7a3be27a3 to dev
+* Cherry-pick 9a2b222cba94126591b5d985a42d40c704a73c90 to dev
+
 #### dartfmt
 
 *   Tweak set literal formatting to follow other collection literals.
diff --git a/tools/VERSION b/tools/VERSION
index 46b49af..83fcfb8 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -34,6 +34,6 @@
 MINOR 2
 PATCH 1
 PRERELEASE 3
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
 ABI_VERSION 1
 OLDEST_SUPPORTED_ABI_VERSION 0