Once #29280 (moved) merges, we want to write a separate branch that skips "make test" in stem builds.