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

Change-Id: I376e83c09515ba50a7e033e3cb75e0c5f8a24ccf