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

Change-Id: I38ec390c54b7f1a7fc99059f32d0d5bf12b00da9