Merge "Revert "IComposerClient wrapper for VTS tests""