Version 2.1.0-dev.3.1

Cherry-pick bd9645abad40d14c8cd9197dfb5c9cc45b20e9d6 to dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 758e334..672fc842 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 2.1.0-dev.3.1
+
+### Tool Changes
+
+#### dartanalyzer
+
+* Fix a bug in analyzer by cherry-picking commit
+  bd9645abad40d14c8cd9197dfb5c9cc45b20e9d6
+
 ## 2.1.0-dev.3.0
 
 ### Core library changes
diff --git a/tools/VERSION b/tools/VERSION
index f2c3b69..dedc53a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 1
 PATCH 0
 PRERELEASE 3
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1