Merge "Do not mark in-process NetworkStack as persistent" into qt-dev
am: 0a51e93a9b

Change-Id: I0734281d0793426f6c9c8f2b1cd1bdd69eefad7c