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

Change-Id: Ib321ca514a53d0c038affbd0ee5757eb5cee5dbb