Merge "Replacing cpi->rc with rc."