Merge "Do not mark in-process NetworkStack as persistent"
am: 67245262ef

Change-Id: I49be157c10a26485ae0683e020ee356a5251036c