Merge "init: don't generate tombstones for expected test failures"