diff --git a/dist/webapis-media-query.js b/dist/webapis-media-query.js
new file mode 100644
index 000000000..9ed5abe23
--- /dev/null
+++ b/dist/webapis-media-query.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n():"function"==typeof define&&define.amd?define(n):n()}(this,function(){"use strict";function e(e,n,t,r,i){var u=e[c];if(u)for(var o=0;o<u.length;o++){var a=u[o],v=a.data,s=v.handler;if((v.handler===n||s.listener===n)&&v.useCapturing===r&&v.eventName===t)return i&&u.splice(o,1),a}return null}function n(e,n,t){var r=e[c];r||(r=e[c]=[]),t?r.unshift(n):r.push(n)}function t(t,r,i,u,o,v){function c(e){var t=e.data;return n(t.target,e,o),t.invokeAddFunc(d,e)}function s(n){var t=n.data;return e(t.target,n.invoke,t.eventName,t.useCapturing,!0),t.invokeRemoveFunc(h,n)}void 0===i&&(i=!0),void 0===u&&(u=!1),void 0===o&&(o=!1),void 0===v&&(v=f);var d=a(t),h=a(r),l=!i&&void 0;return function(n,r){var i=v(n,r);i.useCapturing=i.useCapturing||l;var o=null;"function"==typeof i.handler?o=i.handler:i.handler&&i.handler.handleEvent&&(o=function(e){return i.handler.handleEvent(e)});var a=!1;try{a=i.handler&&"[object FunctionWrapper]"===i.handler.toString()}catch(f){return}if(!o||a)return i.invokeAddFunc(d,i.handler);if(!u){var h=e(i.target,i.handler,i.eventName,i.useCapturing,!1);if(h)return i.invokeAddFunc(d,h)}var g=Zone.current,p=i.target.constructor.name+"."+t+":"+i.eventName;g.scheduleEventTask(p,o,i,c,s)}}function r(n,t,r){void 0===t&&(t=!0),void 0===r&&(r=f);var i=a(n),u=!t&&void 0;return function(n,t){var o=r(n,t);o.useCapturing=o.useCapturing||u;var a=e(o.target,o.handler,o.eventName,o.useCapturing,!0);a?a.zone.cancelTask(a):o.invokeRemoveFunc(i,o.handler)}}function i(e,n,i,u){return void 0===n&&(n=s),void 0===i&&(i=d),void 0===u&&(u=f),!(!e||!e[n])&&(o(e,n,function(){return t(n,i,!0,!1,!1,u)}),o(e,i,function(){return r(i,!0,u)}),!0)}function u(e,n){try{return Function("f","return function "+e+"(){return f(this, arguments)}")(n)}catch(t){return function(){return n(this,arguments)}}}function o(e,n,t){for(var r=e;r&&Object.getOwnPropertyNames(r).indexOf(n)===-1;)r=Object.getPrototypeOf(r);!r&&e[n]&&(r=e);var i,o=a(n);return r&&!(i=r[o])&&(i=r[o]=r[n],r[n]=u(n,t(i,o,n))),i}var a=function(e){return"__zone_symbol__"+e},v="object"==typeof window&&window||"object"==typeof self&&self||global,c=(!("nw"in v)&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),a("eventTasks")),s="addEventListener",d="removeEventListener",f=function(e,n){return{useCapturing:n[2],eventName:n[0],handler:n[1],target:e||v,name:n[0],invokeAddFunc:function(e,n){return n&&n.invoke?this.target[e](this.eventName,n.invoke,this.useCapturing):this.target[e](this.eventName,n,this.useCapturing)},invokeRemoveFunc:function(e,n){return n&&n.invoke?this.target[e](this.eventName,n.invoke,this.useCapturing):this.target[e](this.eventName,n,this.useCapturing)}}};t(s,d),r(d),a("originalInstance");!function(e){function n(e){e.MediaQueryList&&i(e.MediaQueryList.prototype,"addListener","removeListener",function(n,t){return{useCapturing:!1,eventName:"mediaQuery",handler:t[0],target:n||e,name:"mediaQuery",invokeAddFunc:function(e,n){return n&&n.invoke?this.target[e](n.invoke):this.target[e](n)},invokeRemoveFunc:function(e,n){return n&&n.invoke?this.target[e](n.invoke):this.target[e](n)}}})}n(e)}("object"==typeof window&&window||"object"==typeof self&&self||global)});
\ No newline at end of file
diff --git a/dist/webapis-notification.js b/dist/webapis-notification.js
new file mode 100644
index 000000000..b8036576c
--- /dev/null
+++ b/dist/webapis-notification.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(this,function(){"use strict";function e(e,t){var n=Object.getOwnPropertyDescriptor(e,t)||{enumerable:!0,configurable:!0},r=Object.getOwnPropertyDescriptor(e,"original"+t);!r&&n.get&&Object.defineProperty(e,"original"+t,{enumerable:!1,configurable:!0,get:n.get}),delete n.writable,delete n.value;var i=t.substr(2),o="_"+t;n.set=function(e){if(this[o]&&this.removeEventListener(i,this[o]),"function"==typeof e){var t=function(t){var n;n=e.apply(this,arguments),void 0==n||n||t.preventDefault()};this[o]=t,this.addEventListener(i,t,!1)}else this[o]=null},n.get=function(){var r=this[o]||null;if(null===r){var i=Object.getOwnPropertyDescriptor(e,"original"+t);i&&i.get&&(r=i.get.apply(this,arguments),r&&(n.set.apply(this,[r]),this.removeAttribute(t)))}return this[o]||null},Object.defineProperty(e,t,n)}function t(t,n){var r=[];for(var i in t)"on"==i.substr(0,2)&&r.push(i);for(var o=0;o<r.length;o++)e(t,r[o]);if(n)for(var a=0;a<n.length;a++)e(t,"on"+n[a])}function n(e,t,n,r,i){var o=e[s];if(o)for(var a=0;a<o.length;a++){var u=o[a],v=u.data,c=v.handler;if((v.handler===t||c.listener===t)&&v.useCapturing===r&&v.eventName===n)return i&&o.splice(a,1),u}return null}function r(e,t,n){var r=e[s];r||(r=e[s]=[]),n?r.unshift(t):r.push(t)}function i(e,t,i,o,u,s){function v(e){var t=e.data;return r(t.target,e,u),t.invokeAddFunc(f,e)}function c(e){var t=e.data;return n(t.target,e.invoke,t.eventName,t.useCapturing,!0),t.invokeRemoveFunc(d,e)}void 0===i&&(i=!0),void 0===o&&(o=!1),void 0===u&&(u=!1),void 0===s&&(s=l);var f=a(e),d=a(t),p=!i&&void 0;return function(t,r){var i=s(t,r);i.useCapturing=i.useCapturing||p;var a=null;"function"==typeof i.handler?a=i.handler:i.handler&&i.handler.handleEvent&&(a=function(e){return i.handler.handleEvent(e)});var u=!1;try{u=i.handler&&"[object FunctionWrapper]"===i.handler.toString()}catch(l){return}if(!a||u)return i.invokeAddFunc(f,i.handler);if(!o){var d=n(i.target,i.handler,i.eventName,i.useCapturing,!1);if(d)return i.invokeAddFunc(f,d)}var h=Zone.current,g=i.target.constructor.name+"."+e+":"+i.eventName;h.scheduleEventTask(g,a,i,v,c)}}function o(e,t,r){void 0===t&&(t=!0),void 0===r&&(r=l);var i=a(e),o=!t&&void 0;return function(e,t){var a=r(e,t);a.useCapturing=a.useCapturing||o;var u=n(a.target,a.handler,a.eventName,a.useCapturing,!0);u?u.zone.cancelTask(u):a.invokeRemoveFunc(i,a.handler)}}var a=function(e){return"__zone_symbol__"+e},u="object"==typeof window&&window||"object"==typeof self&&self||global,s=(!("nw"in u)&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),a("eventTasks")),v="addEventListener",c="removeEventListener",l=function(e,t){return{useCapturing:t[2],eventName:t[0],handler:t[1],target:e||u,name:t[0],invokeAddFunc:function(e,t){return t&&t.invoke?this.target[e](this.eventName,t.invoke,this.useCapturing):this.target[e](this.eventName,t,this.useCapturing)},invokeRemoveFunc:function(e,t){return t&&t.invoke?this.target[e](this.eventName,t.invoke,this.useCapturing):this.target[e](this.eventName,t,this.useCapturing)}}};i(v,c),o(c),a("originalInstance");!function(e){function n(e){var n=e.Notification;n&&n.prototype&&t(n.prototype,null)}n(e)}("object"==typeof window&&window||"object"==typeof self&&self||global)});
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 086feeac8..6002dbbcd 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -86,8 +86,12 @@ gulp.task('build/zone.min.js', ['compile-esm'], function(cb) {
   return generateScript('./lib/browser/rollup-main.ts', 'zone.min.js', true, cb);
 });
 
-gulp.task('build/web-api.js', ['compile-esm'], function(cb) {
-    return generateScript('./lib/browser/web-api.ts', 'web-api.js', true, cb);
+gulp.task('build/webapis-media-query.js', ['compile-esm'], function(cb) {
+    return generateScript('./lib/browser/webapis-media-query.ts', 'webapis-media-query.js', true, cb);
+});
+
+gulp.task('build/webapis-notification.js', ['compile-esm'], function(cb) {
+    return generateScript('./lib/browser/webapis-notification.ts', 'webapis-notification.js', true, cb);
 });
 
 gulp.task('build/jasmine-patch.js', ['compile-esm'], function(cb) {
@@ -155,7 +159,8 @@ gulp.task('build', [
   'build/zone.js.d.ts',
   'build/zone.min.js',
   'build/zone-node.js',
-  'build/web-api.js',
+  'build/webapis-media-query.js',
+  'build/webapis-notification.js',
   'build/jasmine-patch.js',
   'build/jasmine-patch.min.js',
   'build/mocha-patch.js',
diff --git a/lib/browser/web-api.ts b/lib/browser/webapis-media-query.ts
similarity index 100%
rename from lib/browser/web-api.ts
rename to lib/browser/webapis-media-query.ts
diff --git a/lib/browser/webapis-notification.ts b/lib/browser/webapis-notification.ts
new file mode 100644
index 000000000..f7120da92
--- /dev/null
+++ b/lib/browser/webapis-notification.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {patchOnProperties} from '../common/utils';
+
+((_global: any) => {
+  // patch Notification
+  patchNotification(_global);
+
+  function patchNotification(_global: any) {
+    const Notification = _global['Notification'];
+    if (!Notification || !Notification.prototype) {
+      return;
+    }
+
+    patchOnProperties(Notification.prototype, null);
+  }
+})(typeof window === 'object' && window || typeof self === 'object' && self || global);
diff --git a/test/browser/MediaQuery.spec.ts b/test/browser/MediaQuery.spec.ts
index 1c812aa11..f88064cb4 100644
--- a/test/browser/MediaQuery.spec.ts
+++ b/test/browser/MediaQuery.spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import '../../lib/browser/web-api';
+import '../../lib/browser/webapis-media-query';
 
 import {zoneSymbol} from '../../lib/common/utils';
 import {ifEnvSupports} from '../test-util';