Merge "Remove unreliable CFI test." into main