am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev

* commit 'd74681763c4ca9047b006efab5098a87e302f479':
  Crash apps with bad notification icons.