ref: 0091fef7a2ee5f5519e1675a9a961234cc3b6f8b
parent: f288c943c4d6c3fb03266dee821df797fb99bde0
parent: fac947df77e6ad974c4b121de1d1a5be64de1375
author: Alex Converse <aconverse@google.com>
date: Tue Feb 9 20:21:01 EST 2016
Merge "Restore previous motion search bit-error scale."