Merge "Split WSI OOM tests over multiple iterations." into nyc-dev