Merge "Move RoS allocator to use unordered_set."