Merge "Performance fix for Intrinsic 5x5 convolve." into jb-mr1-dev