Merge "Fix failure vts tests:" into oc-dr1-dev
am: 55967b136e

Change-Id: Ie4131520b9d5915cccd7ef57b3063c7b5e3bf1c5