Merge "Update vts test to use the updated test template." into oc-mr1-dev am: 69270ce30f
am: 4cf8cc0348  -s ours

Change-Id: I1c59e64fb2d9c245df93a8243dc59d1180dfb18c