Merge "sepolicy change for NetworkStack signature"