Version 2.2.1-dev.2.0

Merge commit '9d3988eb67b3c388fb8eb4425da3ba07182e08a2' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 266cce2..110eaf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,11 @@
-## 2.2.1-dev.XX.0
-(Add new changes here, and they will be copied to the change section for the
-  next dev version)
+## 2.2.1-dev.2.0
 
-### Language
+## 2.2.1-dev.1.1
 
-### Core library changes
+* Cherry-pick 567d552de8ff93d704111467e7f3bf3b896ab684 to dev
+* Cherry-pick 4ca57befd707a0309e384472a566c084eef0e56e to dev
 
-### Dart VM
+## 2.2.1-dev.1.0
 
 * RegExp patterns can now use lookbehind assertions.
 
@@ -51,7 +50,11 @@
 
 [visualizer]: https://dart-lang.github.io/dump-info-visualizer/
 
-#### Other Tools
+## 2.2.1-dev.0.0
+
+* Cherry-pick 6f8415245d4dd298730facf83e03de69fc29bbd3 to dev
+* Cherry-pick e7d263b05f7f66d15f778df60ee60625e9a3c5f4 to dev
+* Cherry-pick dc8a56bc0ece296915c7016e0a8241c7068eca18 to dev
 
 ## 2.2.0 - 2019-02-26
 
diff --git a/tools/VERSION b/tools/VERSION
index 8e37f07..2096130 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -29,11 +29,11 @@
 #  * Deprecating an old ABI version:
 #     - increase OLDEST_SUPPORTED_ABI_VERSION to the version that is supported.
 #
-CHANNEL be
+CHANNEL dev
 MAJOR 2
 MINOR 2
 PATCH 1
-PRERELEASE 0
+PRERELEASE 2
 PRERELEASE_PATCH 0
 ABI_VERSION 0
 OLDEST_SUPPORTED_ABI_VERSION 0