Version 2.1.0-dev.7.0

Merge commit 'a50dfd66980ed5c9aef9851fcc57557fb607769c' into dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eec91d4..af78436 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,4 @@
-## 2.1.0-dev.XX.0
-(Add new changes here, and they will be copied to the change section for the
-  next dev version)
+## 2.1.0-dev.7.0
 
 ### Language
 
@@ -53,20 +51,10 @@
 *   Made `Uri` parsing more permissive about `[` and `]` occurring
     in the path, query or fragment, and `#` occurring in fragment.
 
-### Dart VM
-
-### Tool Changes
-
-#### Pub
-
-#### Other Tools
-
 ## 2.1.0-dev.6.0
 
 ## 2.1.0-dev.5.0
 
-### Core library changes
-
 #### `dart:core`
 
 *   Exported `Future` and `Stream` from `dart:core`.
diff --git a/tools/VERSION b/tools/VERSION
index 3408fb4..272ca47 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -23,9 +23,9 @@
 #  * Making cherry-picks to stable channel
 #     - increase PATCH by 1
 #
-CHANNEL be
+CHANNEL dev
 MAJOR 2
 MINOR 1
 PATCH 0
-PRERELEASE 0
+PRERELEASE 7
 PRERELEASE_PATCH 0