diff --git a/CHANGELOG.md b/CHANGELOG.md
index 110eaf0..0c8043b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 2.2.1-dev.2.1
+
+* Cherry-pick 611a53ee5eb091af491ed8fa74295ee779743a90 to dev
+
+#### dartfmt
+
+* Tweak set literal formatting to follow other collection literals.
+* Add support for "UI as code" features.
+
 ## 2.2.1-dev.2.0
 
 ## 2.2.1-dev.1.1
diff --git a/DEPS b/DEPS
index c6f2c79..724eb2b 100644
--- a/DEPS
+++ b/DEPS
@@ -67,19 +67,19 @@
   "csslib_tag" : "0.14.4+1",
   "dart2js_info_tag" : "0.6.0",
 
-  # Note: updates to dart_style have to be coordinated carefully with
-  # the infrastructure-team so that the internal formatter in
-  # `sdk/tools/sdks/dart-sdk/bin/dartfmt` matches the version here.
+  # Note: Updates to dart_style have to be coordinated with the infrastructure
+  # team so that the internal formatter in `tools/sdks/dart-sdk/bin/dartfmt`
+  # matches the version here.
   #
   # Please follow this process to make updates:
-  #   * file an issue with area-infrastructure requesting a roll for this
-  #     package (please also indicate what version to roll).
-  #   * let the infrastructure team submit the change on your behalf,
-  #     so they can build a new dev release and roll the submitted sdks a few
-  #     minutes later.
+  #
+  # *   Create a commit that updates the version here to the desired version and
+  #     adds any appropriate CHANGELOG text.
+  # *   Send that to eng-prod to review. They will update the checked-in SDK
+  #     and land the review.
   #
   # For more details, see https://github.com/dart-lang/sdk/issues/30164
-  "dart_style_tag": "1.2.4",  # Please see the note above before updating.
+  "dart_style_tag": "1.2.5",  # Please see the note above before updating.
 
   "dartdoc_tag" : "v0.28.2",
   "fixnum_tag": "0.10.9",
diff --git a/tools/VERSION b/tools/VERSION
index 2096130..d646102 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -34,6 +34,6 @@
 MINOR 2
 PATCH 1
 PRERELEASE 2
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
 ABI_VERSION 0
 OLDEST_SUPPORTED_ABI_VERSION 0