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

Change-Id: Id82295a163c4abbd0b9fc1ac8fde12ebd9a43030