Fix crashes after notifying bad notification
am: 78c4114101

Change-Id: I4d72feb9a40b99c5b40307ad01d708b3a66d1f54