Version 2.3.0-dev.0.0

Merge commit '523666a97a21a29994d8ed17cdf13a4a4b082d06' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 650397d..124f50a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,21 @@
-## 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.3.0-dev.0.0
 
-### Language
+### Tool Changes
 
-### Core library changes
+#### Linter
+
+The Linter was updated to `0.1.86` which includes the following change:
+* new lint: `prefer_inlined_adds`
+
+## 2.2.1-dev.4.2
+
+* Cherry-pick ab66a3808b28dfc94eaf0ed151c13f4fc696b5dc to dev
+
+## 2.2.1-dev.4.1
+
+* Cherry-pick 72b7e95c74b3ec0f0530322923713162a83013e2 to dev
+
+## 2.2.1-dev.4.0
 
 ### Dart VM
 
@@ -15,23 +26,19 @@
 
 #### Linter
 
-The Linter was updated to `0.1.86` which includes the following changes:
+The Linter was updated to `0.1.85` which includes the following changes:
 
 * new lint: `prefer_inlined_adds`
 * new lint: `prefer_for_elements_to_map_fromIterable`
 * new lint: `prefer_if_elements_to_conditional_expressions`
 * new lint: `diagnostic_describe_all_properties`
 
-#### Other Tools
-
 ## 2.2.1-dev.3.1
 
 * Cherry-pick 245576a096a2da54ef21d664d37d1f50f6f8dbb7 to dev
 * Cherry-pick a47b4ad2b8683cc8a82aa0ff89da2db7a3be27a3 to dev
 * Cherry-pick 9a2b222cba94126591b5d985a42d40c704a73c90 to dev
 
-### Tool Changes
-
 #### dartfmt
 
 *   Tweak set literal formatting to follow other collection literals.
diff --git a/tools/VERSION b/tools/VERSION
index 7a3f749..cf8239f 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -29,10 +29,10 @@
 #  * 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
+MINOR 3
+PATCH 0
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 4