Merge "Add NetworkStackPermissionStub definitions"