Merge "Revert "Modify VTS error check so that the error code can be displayed""