ref: 66a3438602eb0f828f1533cd12d97cdf7c38dfa8
parent: bd2e7fa1c8b9923c741d338f33b63c1a92649af0
parent: 7e4c306981737953774325d4978a5bf6980adaf0
author: Johann Koenig <johannkoenig@chromium.org>
date: Mon May 9 14:38:12 EDT 2016
Merge "Use canonical avg_pred functions"