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

Change-Id: I0bd2e07ed891594beec53087703ded7d51d93657