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

Change-Id: I63f66bbc8f2421a3f878795b02c7f8b32d542094