Merge "Pick up correct dequant for segment with new-quant." into nextgenv2