Merge "TIAF: cleanup APIs of setup session use case"