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