Merge "Update the vts test name and test configure." am: 06fa925b10 am: a61879e692
am: cb0a71d974

Change-Id: Id9b4d2535990354215efa977fdd1c5373d8280ac