Merge "Fix SqlBagOStuff exptime uniqueness assumption"