Merge "Merge "Fix vts tests:" into oc-dev am: dda2e8cdc2 am: 50c1bfdb0c" into oc-dr1-dev-plus-aosp