Use canonical avg_pred functions

Change-Id: Ibe0cc388226622561d2b4a00e5bdc1016a3c4a94
1 file changed