Merge "Modify UT after adding output type parameter"