From 3e7eb63d023fb988885dc0e70d3a7a434507ab36 Mon Sep 17 00:00:00 2001
From: vivian-hu <41269630+vivian-hu@users.noreply.github.com>
Date: Wed, 12 Dec 2018 15:51:44 -0800
Subject: [PATCH 1/6] Revert "build: update nodejs bazel rules (#14466)"

This reverts commit a3fef46a8eade83ca763c6a83842581a201d8cf7.

From 63d291ade20822467390c3ef2dd5a23e30fd6774 Mon Sep 17 00:00:00 2001
From: vivian-hu <41269630+vivian-hu@users.noreply.github.com>
Date: Wed, 12 Dec 2018 15:51:44 -0800
Subject: [PATCH 2/6] Revert "docs(form-field): native select reset values not
 working in examples (#14236)"

This reverts commit 97f52c092426cf6f097f08426b064d4d0b61a957.

From 13cfa77a3e85900a6951e2d4530f53735e544fbf Mon Sep 17 00:00:00 2001
From: vivian-hu <41269630+vivian-hu@users.noreply.github.com>
Date: Wed, 12 Dec 2018 15:51:44 -0800
Subject: [PATCH 3/6] Revert "fix(menu): allow text wrapping in menu items
 (#11430)"

This reverts commit 3661abe06109d1f675ae4089b09169f9170f65dd.

From 6af9071352cc51af45c2c10d59d5e326fbe3a1bf Mon Sep 17 00:00:00 2001
From: vivian-hu <41269630+vivian-hu@users.noreply.github.com>
Date: Wed, 12 Dec 2018 15:51:44 -0800
Subject: [PATCH 4/6] Revert "fix(dialog,bottom-sheet): invert backdrop color
 on dark themes (#13065)"

This reverts commit fe96f38c103acb1d5b05ebec373bcaee9560f02d.

From 0832de5a6c6c2ce6c7ff166fa9f499d2d9580167 Mon Sep 17 00:00:00 2001
From: vivian-hu <41269630+vivian-hu@users.noreply.github.com>
Date: Wed, 12 Dec 2018 15:51:44 -0800
Subject: [PATCH 5/6] Revert "build: replace deprecated tslint rule with
 compiler option (#13186)"

This reverts commit 5dfa45ffa468cabbad47fdfc04a3e0f36f1efbc9.

From 039dd7d709b27d834e3c2df892bc9d90cda28ee2 Mon Sep 17 00:00:00 2001
From: vivian-hu <41269630+vivian-hu@users.noreply.github.com>
Date: Wed, 12 Dec 2018 15:51:44 -0800
Subject: [PATCH 6/6] Revert "fix(snack-bar): announcing same message twice to
 screen readers (#13298)"

This reverts commit 3fb4b2372f419f0728e6a889e930bd3868673880.
---
 src/lib/snack-bar/snack-bar.spec.ts | 8 +++++---
 src/lib/snack-bar/snack-bar.ts      | 6 ++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/snack-bar/snack-bar.spec.ts b/src/lib/snack-bar/snack-bar.spec.ts
index 21fc199a7bb5..2a65a919a07e 100644
--- a/src/lib/snack-bar/snack-bar.spec.ts
+++ b/src/lib/snack-bar/snack-bar.spec.ts
@@ -186,16 +186,18 @@ describe('MatSnackBar', () => {
   }));
 
 
-  it('should clear the announcement message if it is the same as main message', fakeAsync(() => {
+  it('should default to the passed message for the announcement message', fakeAsync(() => {
     spyOn(liveAnnouncer, 'announce');
 
-    snackBar.open(simpleMessage, undefined, {announcementMessage: simpleMessage});
+    snackBar.open(simpleMessage);
     viewContainerFixture.detectChanges();
 
     expect(overlayContainerElement.childElementCount)
       .toBe(1, 'Expected the overlay with the default announcement message to be added');
 
-    expect(liveAnnouncer.announce).not.toHaveBeenCalled();
+    // Expect the live announcer to have been called with the display message and some
+    // string for the politeness. We do not want to test for the default politeness here.
+    expect(liveAnnouncer.announce).toHaveBeenCalledWith(simpleMessage, jasmine.any(String));
   }));
 
   it('should be able to specify a custom announcement message', fakeAsync(() => {
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index 84d1293f66b7..d2028d0dd1bb 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -114,10 +114,8 @@ export class MatSnackBar implements OnDestroy {
     // override the data to pass in our own message and action.
     _config.data = {message, action};
 
-    // Since the snack bar has `role="alert"`, we don't
-    // want to announce the same message twice.
-    if (_config.announcementMessage === message) {
-      _config.announcementMessage = undefined;
+    if (!_config.announcementMessage) {
+      _config.announcementMessage = message;
     }
 
     return this.openFromComponent(SimpleSnackBar, _config);