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

Change-Id: If34443f5f535b3e970cf2dace49f2c9e9ea33ac1