Merge "Add more log output to the CFI test."