[automerger skipped] Merge "Crash the system server if network stack is lost" into qt-dev
am: 27ac06ea -s ours
am skip reason: change_id I64f366fc69b52f27d65461be50d81edc199bcb62 with SHA1 cec6a71e is in history
Change-Id: I8b67d4e507d0ec8703ec12147db8ac68a3805d17