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

Change-Id: I6c34ee4d363c3d485abc8e71d938c1e3a98e6f51