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

Change-Id: I20b62dd5c93feb863ddfcb042aa55ff7020dccf0