diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44b7ec9..237f3a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.0-dev.2.1
+
+* Cherry-pick 765e6338a803ee17472b1fa715ffcfbd4ea46bfb to dev
+
 ## 2.2.0-dev.2.0
 
 ### Language
diff --git a/sdk/lib/ffi/ffi.dart b/sdk/lib/ffi/ffi.dart
index 407cc12..5176ebb 100644
--- a/sdk/lib/ffi/ffi.dart
+++ b/sdk/lib/ffi/ffi.dart
@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file
 
+/// {@category VM}
+/// {@nodoc}
 library dart.ffi;
 
 part "native_type.dart";
diff --git a/tools/VERSION b/tools/VERSION
index 42623de1..4c8c6f5 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 2
 PATCH 0
 PRERELEASE 2
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1