am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev

* commit '9b2f9bcb56765c52a2fc9cdcdcf11c6707403210':
  Crashing the system process is inadvisable