Merge "Fix EVS VTS test cases" into tm-dev