[automerger skipped] Merge "Revert "Make the network stack a persistent process."" into qt-dev
am: a7df107e06 -s ours
am skip reason: change_id I35ded113b31e742f13ad8523a10af3a83a111374 with SHA1 5574fd5248 is in history

Change-Id: Ib7ad6d0471b87f9f29a57c24d67c329e6e39b997