ref: 28ff0e0d1d2e08739775ff0c9b9044db1d1b9c1a
parent: ca4df94858f46621bc83feb33de8f31ecf6142b5
parent: ed3df445d99b511d3e39615a2f0a9d23c18efa3a
author: Alex Converse <aconverse@google.com>
date: Wed Jan 13 16:51:23 EST 2016
Merge "Revert "Merge "Change highbd variance rounding to prevent negative variance."""