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

Change-Id: I2fb552c7aafd4ec813e1a59abeee19413a936835