Merge "Remove redundant code in new_quant" into nextgenv2