Merge "Rename and simplify DropPermissionHolder"