Merge "Cleanup: using cm variable instead of cpi->common."