Merge "base: Fix an infinite loop in HashSet::Insert"