Merge "Fix vts tests:" into oc-dr1-dev
am: 8ee9a9f01e

Change-Id: I580e6127c0c6ff3898f3d5a6390855404a8c14b3