Version 1.22.0-dev.10.7

Cherry-pick 6af28fcb70010f5804410890e5ac2b29858808a6 to dev
diff --git a/pkg/compiler/lib/src/js_emitter/class_stub_generator.dart b/pkg/compiler/lib/src/js_emitter/class_stub_generator.dart
index 06d08df..5d7b4b5 100644
--- a/pkg/compiler/lib/src/js_emitter/class_stub_generator.dart
+++ b/pkg/compiler/lib/src/js_emitter/class_stub_generator.dart
@@ -40,9 +40,8 @@
     var typeParameters = const <jsAst.Parameter>[];
     var typeInits = const <jsAst.Expression>[];
     if (hasRtiField) {
-      String parameterName = r'$ti';
-      typeParameters = parameterName;
-      typeInits = js('this.# = #', [namer.rtiFieldName, parameterName]);
+      typeParameters = namer.rtiFieldName;
+      typeInits = js('this.# = #', [namer.rtiFieldName, namer.rtiFieldName]);
     }
     return js('function(#, #) { #; #; this.#();}', [
       fields,
diff --git a/tools/VERSION b/tools/VERSION
index ba3edfa..455a4a0 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
 MINOR 22
 PATCH 0
 PRERELEASE 10
-PRERELEASE_PATCH 6
+PRERELEASE_PATCH 7