Merge "Fix to delete portal admin"