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

Change-Id: I9f1e636014971b0931206289d05fd41bebf9b3bc