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

Change-Id: I679181fb5f23c48825c21d9a210e70eaca3835f2