Merge "Revert "Re-promoting some tests to postsubmit"" into main