Merge "Remove cpi parameter from update_mvcount()"