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