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

Change-Id: I7b05e1c54ed2ed759b5d92180edbfbdda2df841c