Merge "Revert "Make the network stack a persistent process."" am: d38eaa8820 am: b2a5d85522
am: 228ed521b8

Change-Id: I42f02cc80a423f97c9bc569ad738fa01d715c85e