am 846a482a: am ade5f387: Merge "Revert to jb-mr2 handling of app died." into klp-dev

* commit '846a482a0d891a799bfd6e9b00ed5b401a791b30':
  Revert to jb-mr2 handling of app died.