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

Change-Id: Ic5623b62f1478b620a10fb0ed70678e93585edad