Merge "Use standard rounding in combine_interintra." into nextgenv2