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

Change-Id: Ieef3e2121de46c0bf3b324a491b7b92bfb0b1e1c