Merge "Change vts target base test class name" am: 4f4fdaf664
am: a8239094f4

Change-Id: If6245264c41f92dc6f89a0bfd6001db07e211de4