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

Change-Id: I538172421bc58510b301367bf788f4e541e192f8