Merge "Fix VTS BatchingOperation Test." into sc-dev