Merge "Fix vts tests:" into oc-dev am: 14b34e19d6  -s ours
am: 7a5dad06bf  -s ours

Change-Id: If1acc3cef00cd887446d135a89510e241a616dca