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

Change-Id: I07d4f185a096c22628cd0d0ffcb789391a81f518