Merge "Fix checker tests in 458-checker-instruction-simplification."