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

Change-Id: I15a7495debbcf6a4b1960d1e7307120afa485830