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

Change-Id: I6cc53558417aa8eb09ba296c5a126a6719acdaf5