Merge "Fix vts tests:" into oc-dev
am: dda2e8cdc2

Change-Id: I48640bc1b6225e39309f2832613986fce4a43754