Merge "Update VTS tests so that more tests pass for O." into oc-dr1-dev
am: 45a97e51bb  -s ours

Change-Id: I4c547533669dfa8a6e10ccb0bac69a5e9d72e022