Merge "Avoid odd behavior when clearing nonexistent SID"