swift
Fix some rebranch test failures on main
#81279
Merged

Loading