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

* commit '49ae8f2ef20843514e63aff5378dbdc0644ee0cb':
  Crash apps with bad notification icons.