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

Change-Id: If80eae601d647f2fd943e98ddd411206375ec969