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

Change-Id: Ibc3a6465dba226a292364eb5f42e97f609db97da