Merge "Fix crashes after notifying bad notification" into nyc-mr1-dev am: d517c3c16b am: 531099ae14
am: 1c042cc6c3

Change-Id: Ibf8794b657a33f314ead19e720b98c1bf7c2e60c