Merge "Amend networkstack sepolicy for testing"