Required to land MR!9702, in pursuit of #22426 this is a single line change that reflects the changes to the UniqMap API in !9702.
UniqMap