Merge "Crash the system server if network stack is lost"
am: 825181be4c

Change-Id: Ieddb968a162c20af90dd290c2b26b48659a480a9