[automerger skipped] Merge "Make the network stack a persistent process." into...
[automerger skipped] Merge "Make the network stack a persistent process." into qt-dev am: 42a5a8de -s ours
am: e894b51d -s ours
am skip reason: change_id Ic8ebf6356e23489f6cd984d680ff9f1b4cbbe52d with SHA1 796afddd is in history
Change-Id: Ifede3708f43ec88fcfbcee678d85daeacf368724