Merge "Crashing the system process is inadvisable" into mnc-dev