Merge "Replacing cpi->twopass with twopass."