Merge "Rename NetworkStackPermissionStub"