Merge "Fix highbd obmc_variance unit test" into nextgenv2