Merge "Refactor ConvertORTopoToTapiTopoTest"

No match.