Merge "Fix dropped const qualifier in new_quant experiment" into nextgenv2