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

Change-Id: I83a561ffaadf1eff25bca495d9d522bbe1774c5b