Merge "Change highbd variance rounding to prevent negative variance."