Merge "Increase the run test failure output diff line count."