Merge "Do not mark in-process NetworkStack as persistent"