Merge "Weaver: functional VTS tests" into oc-dr1-dev
am: 1bef889c75

Change-Id: Ib8fbbc1aa4ba03c4d6bce0a7934b841ba4c07c12