Fix crashes after notifying bad notification am: 78c4114101 am: 08011cdf33
am: 9b1500b1dd

Change-Id: I77ef1b0ff052fe922b68cdf7690102933c2e2ccf