diff --git a/src/cdk-experimental/scrolling/tsconfig-build.json b/src/cdk-experimental/scrolling/tsconfig-build.json
index 21ad182a0358..d94e5e159676 100644
--- a/src/cdk-experimental/scrolling/tsconfig-build.json
+++ b/src/cdk-experimental/scrolling/tsconfig-build.json
@@ -6,7 +6,7 @@
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": false, // Workaround for Angular #22210
+    "strictMetadataEmit": true,
     "flatModuleOutFile": "index.js",
     "flatModuleId": "@angular/cdk-experimental/scrolling",
     "skipTemplateCodegen": true,
diff --git a/src/cdk-experimental/scrolling/typings.d.ts b/src/cdk-experimental/scrolling/typings.d.ts
deleted file mode 100644
index ce4ae9b66cf0..000000000000
--- a/src/cdk-experimental/scrolling/typings.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare var module: {id: string};
diff --git a/src/lib/icon/icon.spec.ts b/src/lib/icon/icon.spec.ts
index 61a056e63e75..99f8d5a61bcc 100644
--- a/src/lib/icon/icon.spec.ts
+++ b/src/lib/icon/icon.spec.ts
@@ -428,9 +428,9 @@ describe('MatIcon', () => {
     }));
 
     it('should throw an error when using untrusted HTML', () => {
-      // Stub out console.error so we don't pollute our logs with Angular's warnings.
+      // Stub out console.warn so we don't pollute our logs with Angular's warnings.
       // Jasmine will tear the spy down at the end of the test.
-      spyOn(console, 'error');
+      spyOn(console, 'warn');
 
       expect(() => {
         iconRegistry.addSvgIconLiteral('circle', '<svg><circle></svg>');