Merge "Delete flag-based test now that flag is on by default in staging where tests run." into main